updated french locale to lastest code

[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 c1ff39c347f8d5e14b9c9055baafb9bef98b3e4b..2779ce819ebd6a884036e2becc2dcffe130e6097 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -46,12 +46,17 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/admin/groups/class_groupManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:665
 #: plugins/admin/ogroups/tabs_ogroups.inc:29
+#: plugins/admin/ogroups/class_ogroupManagement.inc:391
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Почта"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:384
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -66,6 +71,7 @@ msgstr "Подключение"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Факс"
@@ -73,13 +79,17 @@ msgstr "Факс"
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_edit.tpl:41
-#: plugins/addons/addressbook/address_edit.tpl:89
+#: plugins/addons/addressbook/address_edit.tpl:48
+#: plugins/addons/addressbook/address_edit.tpl:96
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/admin/groups/class_groupManagement.inc:386
+#: plugins/admin/users/class_userManagement.inc:666
 #: plugins/admin/departments/generic.tpl:58
+#: plugins/admin/systems/class_systemManagement.inc:664
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
+#: plugins/admin/ogroups/class_ogroupManagement.inc:481
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
@@ -107,7 +117,7 @@ msgstr "Доступ"
 msgid "Options"
 msgstr "Параметры"
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:224
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:482
 #, fuzzy
 msgid "Parameter"
 msgstr "Параметры загрузки"
@@ -132,53 +142,53 @@ msgstr "Базы данных"
 msgid "Services"
 msgstr "Сервисы"
 
-#: contrib/gosa.conf:150 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:151 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr "Экспорт"
 
-#: contrib/gosa.conf:151 plugins/personal/mail/generic.tpl:111
+#: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
 msgid "Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:152
+#: contrib/gosa.conf:153
 #, fuzzy
 msgid "CSV Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:167
+#: contrib/gosa.conf:169
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:184
+#: contrib/gosa.conf:186
 msgid "German"
 msgstr "Немецкий"
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:187
 msgid "Russian"
 msgstr "Русский"
 
-#: contrib/gosa.conf:186
+#: contrib/gosa.conf:188
 msgid "Spanish"
 msgstr "Испанский"
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:189
 msgid "French"
 msgstr "Французский"
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:190
 msgid "Dutch"
 msgstr "Датский"
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:191
 msgid "English"
 msgstr "Английский"
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:192
 msgid "Italian"
 msgstr ""
 
@@ -194,6 +204,7 @@ msgstr ""
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:25
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
 #: plugins/gofax/reports/class_faxreport.inc:7
@@ -287,50 +298,56 @@ msgstr ""
 msgid "The address you're trying to add is already used by user"
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: plugins/personal/mail/class_mailAccount.inc:675
+#: plugins/personal/mail/class_mailAccount.inc:689
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:680
+#: plugins/personal/mail/class_mailAccount.inc:694
 #: plugins/admin/groups/class_groupMail.inc:610
 msgid "The required field 'Primary address' is not set."
 msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/personal/mail/class_mailAccount.inc:684
-#: plugins/personal/mail/class_mailAccount.inc:688
-#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
 #: plugins/admin/ogroups/class_mailogroup.inc:67
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr "Введите корректное значение в поле \"Основной адрес\"."
 
-#: plugins/personal/mail/class_mailAccount.inc:695
+#: plugins/personal/mail/class_mailAccount.inc:709
 #: plugins/admin/groups/class_groupMail.inc:619
 #: plugins/admin/ogroups/class_mailogroup.inc:74
 msgid "The primary address you've entered is already in use."
 msgstr "Введенный вами адрес уже используется."
 
-#: plugins/personal/mail/class_mailAccount.inc:701
+#: plugins/personal/mail/class_mailAccount.inc:715
 #: plugins/admin/groups/class_groupMail.inc:625
 msgid "Value in 'Quota size' is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: plugins/personal/mail/class_mailAccount.inc:710
+#: plugins/personal/mail/class_mailAccount.inc:724
 #: plugins/admin/groups/class_groupMail.inc:634
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
 
-#: plugins/personal/mail/class_mailAccount.inc:720
+#: plugins/personal/mail/class_mailAccount.inc:734
 #: plugins/admin/groups/class_groupMail.inc:642
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
 
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Основной адрес"
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:665
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Сервер"
@@ -363,7 +380,7 @@ msgstr "Альтернативные адреса"
 msgid "List of alternative mail addresses"
 msgstr "Список альтернативных адресов эл. почты"
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:126
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/posix_groups.tpl:72
@@ -379,8 +396,8 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
 #: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
 #: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:39
-#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:66
+#: plugins/admin/groups/group_objects.tpl:49
+#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
@@ -389,40 +406,33 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:375
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:633
 #: plugins/gofon/phoneaccount/generic.tpl:11
 msgid "Add"
 msgstr "Добавить"
 
-#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
 #: plugins/personal/samba/samba3.tpl:289
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
-#: plugins/gofax/blocklists/headpage.tpl:18
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:55
-#: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/headpage.tpl:18
-#: plugins/admin/groups/remove.tpl:15 plugins/admin/groups/generic.tpl:90
-#: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:19
+#: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:15
+#: plugins/admin/groups/generic.tpl:90 plugins/admin/users/remove.tpl:15
 #: plugins/admin/applications/remove.tpl:14
-#: plugins/admin/applications/headpage.tpl:18
 #: plugins/admin/departments/remove.tpl:15
-#: plugins/admin/departments/headpage.tpl:18
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
-#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
-#: plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
+#: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
 #: plugins/admin/systems/phonesettings.tpl:182
 #: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/headpage.tpl:18
 #: plugins/gofon/phoneaccount/generic.tpl:13 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/macro/headpage.tpl:18
 msgid "Delete"
 msgstr "Удалить"
 
@@ -456,57 +466,57 @@ msgstr "Выберите, нужно ли фильтровать сообщен
 msgid "Move mails tagged with spam level greater than"
 msgstr "Перемещать сообщения с меткой рекламы больше"
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:83
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Выберите метку рекламы - чем меньше значение, тем чувствительнее фильтр"
 
-#: plugins/personal/mail/generic.tpl:85
+#: plugins/personal/mail/generic.tpl:86
 msgid "to folder"
 msgstr "в папку"
 
-#: plugins/personal/mail/generic.tpl:92
+#: plugins/personal/mail/generic.tpl:93
 msgid "Reject mails bigger than"
 msgstr "Отклонять сообщения размером больше"
 
-#: plugins/personal/mail/generic.tpl:94
+#: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
 #: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "MB"
 msgstr "Мб"
 
-#: plugins/personal/mail/generic.tpl:100
+#: plugins/personal/mail/generic.tpl:101
 msgid "Vacation message"
 msgstr "Сообщение автоответчика"
 
-#: plugins/personal/mail/generic.tpl:117
+#: plugins/personal/mail/generic.tpl:118
 msgid "Forward messages to"
 msgstr "Перенаправлять сообщения"
 
-#: plugins/personal/mail/generic.tpl:128
+#: plugins/personal/mail/generic.tpl:129
 #: plugins/gofax/faxaccount/generic.tpl:76 plugins/admin/groups/mail.tpl:102
 msgid "Add local"
 msgstr "Добавить локально"
 
-#: plugins/personal/mail/generic.tpl:138
+#: plugins/personal/mail/generic.tpl:139
 msgid "Advanced mail options"
 msgstr "Дополнительные почтовые настройки"
 
-#: plugins/personal/mail/generic.tpl:143
+#: plugins/personal/mail/generic.tpl:144
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Выберите, может ли пользователь отправлять и получать сообщения только "
 "внутри своего домена"
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:145
 msgid "User is only allowed to send and receive local mails"
 msgstr "Пользователь может отправлять и получать почту только локально"
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:152
 msgid "Use custom sieve script"
 msgstr "Использовать другой сценарий SIEVE"
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:152
 msgid "disables all Mail options!"
 msgstr "отключает все почтовые настройки!"
 
@@ -517,14 +527,14 @@ msgstr "отключает все почтовые настройки!"
 #: plugins/personal/connectivity/main.inc:116
 #: plugins/gofax/blocklists/generic.tpl:77
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:259
-#: plugins/admin/users/class_userManagement.inc:507
-#: plugins/admin/applications/class_applicationManagement.inc:239
-#: plugins/admin/departments/class_departmentManagement.inc:228
-#: plugins/admin/systems/class_systemManagement.inc:440
-#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/groups/class_groupManagement.inc:338
+#: plugins/admin/users/class_userManagement.inc:583
+#: plugins/admin/applications/class_applicationManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:344
+#: plugins/admin/systems/class_systemManagement.inc:508
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
 #: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
 msgid "Finish"
 msgstr "Готово"
 
@@ -543,28 +553,28 @@ msgstr "Готово"
 #: plugins/gofax/faxaccount/locals.tpl:64
 #: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:108
+#: plugins/addons/addressbook/address_edit.tpl:115
 #: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:261
+#: plugins/admin/groups/class_groupManagement.inc:340
 #: plugins/admin/groups/remove.tpl:17
 #: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/groups/group_objects.tpl:51
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:509
+#: plugins/admin/users/class_userManagement.inc:585
 #: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:241
+#: plugins/admin/applications/class_applicationManagement.inc:313
 #: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:230
-#: plugins/admin/systems/class_systemManagement.inc:442
+#: plugins/admin/departments/class_departmentManagement.inc:346
+#: plugins/admin/systems/class_systemManagement.inc:510
 #: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
 #: plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:272
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
 #: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
 #: plugins/gofon/macro/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:240
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "Отмена"
@@ -580,15 +590,10 @@ msgstr "Нажмите 'Изменить' чтобы отредактирова
 #: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
 #: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
 #: plugins/personal/connectivity/main.inc:127
-#: plugins/gofax/blocklists/headpage.tpl:17
 #: plugins/gofax/faxaccount/generic.tpl:90
 #: plugins/gofax/faxaccount/generic.tpl:96
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/groups/headpage.tpl:17 plugins/admin/users/headpage.tpl:18
-#: plugins/admin/applications/headpage.tpl:17
-#: plugins/admin/departments/headpage.tpl:17
-#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:17
-#: plugins/gofon/phoneaccount/main.inc:112 plugins/gofon/macro/headpage.tpl:17
+#: plugins/gofon/phoneaccount/main.inc:112
 msgid "Edit"
 msgstr "Изменить"
 
@@ -601,8 +606,25 @@ msgstr "Почтовые настройки пользователя"
 msgid "Select addresses to add"
 msgstr "Выберите адреса для добавления"
 
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
+msgstr "Фильтры"
+
 #: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
 msgstr "Показать адреса подразделения"
 
@@ -610,43 +632,38 @@ msgstr "Показать адреса подразделения"
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/gofax/blocklists/headpage.tpl:58
 #: plugins/gofax/faxaccount/locals.tpl:31
-#: plugins/addons/addressbook/contents.tpl:81
-#: plugins/admin/groups/headpage.tpl:66
-#: plugins/admin/groups/group_objects.tpl:27
-#: plugins/admin/groups/mail_locals.tpl:33 plugins/admin/users/headpage.tpl:68
-#: plugins/admin/applications/headpage.tpl:49
-#: plugins/admin/departments/headpage.tpl:47
-#: plugins/admin/systems/headpage.tpl:62
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/headpage.tpl:61 plugins/gofon/macro/headpage.tpl:49
 msgid "Choose the department the search will be based on"
 msgstr "Выбрать раздел, для которого будет осуществлен поиск"
 
 #: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:42
+#: plugins/admin/groups/mail_locals.tpl:44
 msgid "Display addresses matching"
 msgstr "Показать подходяшие адреса"
 
 #: plugins/personal/mail/mail_locals.tpl:31
 #: plugins/personal/posix/trust_machines.tpl:31
 #: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
+#: plugins/admin/groups/mail_locals.tpl:47
 msgid "Regular expression for matching addresses"
 msgstr "Регулярное выражение для поиска адреса"
 
 #: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
+#: plugins/admin/groups/mail_locals.tpl:54
 msgid "Display addresses of user"
 msgstr "Показать адреса пользователя"
 
 #: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
+#: plugins/admin/groups/mail_locals.tpl:57
 msgid "User name of which addresses are shown"
 msgstr "Имя пользователя, адрес которого показан"
 
 #: plugins/personal/password/class_password.inc:5
+#: plugins/admin/systems/class_systemManagement.inc:612
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
@@ -659,6 +676,7 @@ msgstr "Пароль"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:632
 msgid "Change password"
 msgstr "Сменить пароль"
 
@@ -701,8 +719,7 @@ msgstr "Подтверждение"
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:18 plugins/admin/systems/password.tpl:25
+#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:25
 msgid "Set password"
 msgstr "Изменить пароль"
 
@@ -722,16 +739,16 @@ msgstr ""
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1204
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1269
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
-#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:99
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr "Назад"
@@ -747,14 +764,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:174
+#: plugins/admin/users/class_userManagement.inc:252
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Введенные пароли не совпадают!"
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:257
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Вы не указали новый пароль."
 
@@ -779,12 +796,11 @@ msgid "Select systems to add"
 msgstr "Выберите системы для добавления"
 
 #: plugins/personal/posix/trust_machines.tpl:26
-#: plugins/admin/systems/headpage.tpl:59
 msgid "Display systems of department"
 msgstr "Показать системы в подразделении"
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:71
+#: plugins/admin/systems/headpage.tpl:51
 msgid "Display systems matching"
 msgstr "Показать подходяшие системы"
 
@@ -792,43 +808,28 @@ msgstr "Показать подходяшие системы"
 msgid "Select groups to add"
 msgstr "Выберите группы для добавления"
 
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:37
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:38
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/users/headpage.tpl:39
-#: plugins/admin/applications/headpage.tpl:37
-#: plugins/admin/departments/headpage.tpl:37
-#: plugins/admin/systems/headpage.tpl:37
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:37
-msgid "Filters"
-msgstr "Фильтры"
-
 #: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/admin/groups/headpage.tpl:40
 msgid "Select to see groups that are primary groups of users"
 msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
 
 #: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/admin/groups/headpage.tpl:41
 msgid "Show primary groups"
 msgstr "Показать основные группы"
 
 #: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/admin/groups/headpage.tpl:44
 msgid "Select to see groups that have samba groups mappings"
 msgstr "Выберите, чтобы просмотреть группы, которые входят в samba"
 
 #: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/admin/groups/headpage.tpl:45
 msgid "Show samba groups"
 msgstr "Показать группы samba"
 
 #: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:49
+#: plugins/admin/groups/headpage.tpl:48
 msgid "Select to see groups that have applications configured"
 msgstr "Выберите, чтобы просмотреть список групп, которым доступны приложения"
 
@@ -838,48 +839,47 @@ msgid "Show application groups"
 msgstr "Показать группы приложений"
 
 #: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/admin/groups/headpage.tpl:52
 msgid "Select to see groups that have mail settings"
 msgstr ""
 "Выберите, чтобы просмотреть список групп, которым доступны функции эл. почты"
 
 #: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/admin/groups/headpage.tpl:53
 msgid "Show mail groups"
 msgstr "Показать группы с эл. почтой"
 
 #: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:56
 msgid "Select to see normal groups that have only functional aspects"
 msgstr "Выберите, чтобы просмотреть список обычных групп"
 
 #: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:57
 msgid "Show functional groups"
 msgstr "Показать обычные группы"
 
 #: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:60
 msgid "Display groups of department"
 msgstr "Объединения в подразделении"
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:64
+#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Шаблон для групп"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:65
+#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Регулярное выражение, соответствующее именам групп"
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:71
+#: plugins/admin/groups/headpage.tpl:76
 msgid "Display groups of user"
 msgstr "Показать группы пользователей"
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:72
+#: plugins/admin/groups/headpage.tpl:80
 msgid "User name of which groups are shown"
 msgstr "Имя пользователя, для которого перечисляются группы"
 
@@ -961,31 +961,31 @@ msgstr "Атрибуты UNIX"
 msgid "UNIX"
 msgstr "Unix"
 
-#: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:942
+#: plugins/personal/posix/class_posixAccount.inc:133
+#: plugins/personal/posix/class_posixAccount.inc:957
 msgid "Group of user"
 msgstr "Группа пользователя"
 
-#: plugins/personal/posix/class_posixAccount.inc:172
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "unconfigured"
 msgstr "Не настроено"
 
-#: plugins/personal/posix/class_posixAccount.inc:190
+#: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:190
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:192
 msgid "automatic"
 msgstr "автоматически"
 
-#: plugins/personal/posix/class_posixAccount.inc:218
+#: plugins/personal/posix/class_posixAccount.inc:219
 msgid "This account has no unix extensions."
 msgstr "В этой учетной записи нет расширений UNIX."
 
-#: plugins/personal/posix/class_posixAccount.inc:238
-#: plugins/personal/posix/class_posixAccount.inc:241
+#: plugins/personal/posix/class_posixAccount.inc:239
+#: plugins/personal/posix/class_posixAccount.inc:242
 msgid "Remove posix account"
 msgstr "Удалить учетную запись POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:239
+#: plugins/personal/posix/class_posixAccount.inc:240
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba account first."
@@ -993,7 +993,7 @@ msgstr ""
 "В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
 "использование, сначала нужно удалить учетную запись Samba."
 
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:243
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1001,11 +1001,11 @@ msgstr ""
 "В этой учетной записи используются атрибуты POSIX. Вы можете отключить их "
 "использование, щелкнув ниже."
 
-#: plugins/personal/posix/class_posixAccount.inc:245
+#: plugins/personal/posix/class_posixAccount.inc:246
 msgid "Create posix account"
 msgstr "Создать учетную запись POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1042,7 +1042,7 @@ msgstr ""
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
@@ -1053,7 +1053,7 @@ msgstr "Январь"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
@@ -1064,7 +1064,7 @@ msgstr "Февраль"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
@@ -1075,7 +1075,7 @@ msgstr "Март"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:220
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
@@ -1086,7 +1086,7 @@ msgstr "Апрель"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
@@ -1097,7 +1097,7 @@ msgstr "Май"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
@@ -1108,7 +1108,7 @@ msgstr "Июнь"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
@@ -1119,7 +1119,7 @@ msgstr "Июль"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
@@ -1130,7 +1130,7 @@ msgstr "Август"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:221
+#: plugins/personal/generic/class_user.inc:223
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
@@ -1141,7 +1141,7 @@ msgstr "Сентябрь"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
@@ -1152,7 +1152,7 @@ msgstr "Октябрь"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
@@ -1163,7 +1163,7 @@ msgstr "Ноябрь"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:222
+#: plugins/personal/generic/class_user.inc:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
@@ -1190,75 +1190,75 @@ msgstr "разрешить доступ только на эти хосты"
 msgid "Failed: overriding lock"
 msgstr "Ошибка: замещение блокировки"
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:862
 msgid "The required field 'Home directory' is not set."
 msgstr "Обязательное поле \"Домашний каталог\" не заполнено."
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:865
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr "Введите корректный путь в поле \"Домашний каталог\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: plugins/personal/posix/class_posixAccount.inc:873
 msgid "Value specified as 'UID' is not valid."
 msgstr "Значение поля \"UID\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:872
+#: plugins/personal/posix/class_posixAccount.inc:876
 msgid "Value specified as 'UID' is too small."
 msgstr "Значение 'UID' слишком маленькое."
 
-#: plugins/personal/posix/class_posixAccount.inc:876
-#: plugins/admin/groups/class_groupGeneric.inc:610
+#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/admin/groups/class_groupGeneric.inc:617
 msgid "Value specified as 'GID' is not valid."
 msgstr "Значение поля 'GID' некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:879
-#: plugins/admin/groups/class_groupGeneric.inc:613
+#: plugins/personal/posix/class_posixAccount.inc:883
+#: plugins/admin/groups/class_groupGeneric.inc:620
 msgid "Value specified as 'GID' is too small."
 msgstr "Значение 'GID' слишком маленькое."
 
-#: plugins/personal/posix/class_posixAccount.inc:887
+#: plugins/personal/posix/class_posixAccount.inc:891
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "Значение поля \"shadowMin\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:892
+#: plugins/personal/posix/class_posixAccount.inc:896
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "Значение поля \"shadowMax\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:897
+#: plugins/personal/posix/class_posixAccount.inc:901
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "Значение поля \"shadowWarning\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:900
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "Использование \"shadowWarning\" без \"shadowMax\" бессмысленно."
 
-#: plugins/personal/posix/class_posixAccount.inc:903
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "Значение поля \"shadowWarning\" должно быть меньше значения поля \"shadowMax"
 "\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "Значение поля \"shadowWarning\" должно быть больше значения поля \"shadowMin"
 "\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "Значение поля \"shadowInactive\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "Использование \"shadowInactive\" без \"shadowMax\" бессмысленно."
 
-#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:923
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 "Значение поля \"shadowMin\" должно быть меньше значения поля \"shadowMax\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:1021
-#: plugins/admin/groups/class_groupGeneric.inc:644
+#: plugins/personal/posix/class_posixAccount.inc:1036
+#: plugins/admin/groups/class_groupGeneric.inc:651
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
@@ -1509,90 +1509,90 @@ msgstr ""
 "Предупреждение: не удается идентифицировать основную группу, преобразование "
 "в группу Samba невозможно!"
 
-#: plugins/personal/generic/class_user.inc:231
+#: plugins/personal/generic/class_user.inc:233
 msgid "female"
 msgstr "женский"
 
-#: plugins/personal/generic/class_user.inc:231
+#: plugins/personal/generic/class_user.inc:233
 msgid "male"
 msgstr "мужской"
 
-#: plugins/personal/generic/class_user.inc:241
+#: plugins/personal/generic/class_user.inc:243
 msgid "This account has no valid GOsa extensions."
 msgstr "Для этой учетной записи нет корректных расширений GOsa."
 
-#: plugins/personal/generic/class_user.inc:270
+#: plugins/personal/generic/class_user.inc:272
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 "Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
 "прервана."
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:367
 msgid "Please enter a valid serial number"
 msgstr "Введите корректный серийный номер"
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:404
 #, php-format
 msgid ""
 "Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:404
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:404
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:406
+#: plugins/personal/generic/class_user.inc:408
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/class_user.inc:800
+#: plugins/personal/generic/class_user.inc:808
 msgid "Kerberos database communication failed"
 msgstr "Ошибка соединения с базой данных Kerberos"
 
-#: plugins/personal/generic/class_user.inc:817
+#: plugins/personal/generic/class_user.inc:825
 msgid "Can't remove user from kerberos database."
 msgstr "Не удается удалить пользователя из базы данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:828
+#: plugins/personal/generic/class_user.inc:836
 msgid "Can't add user to kerberos database."
 msgstr "Не удается добавить пользователя в базу данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:868
+#: plugins/personal/generic/class_user.inc:876
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/personal/generic/class_user.inc:873
+#: plugins/personal/generic/class_user.inc:881
 #, fuzzy
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/personal/generic/class_user.inc:879
-#: plugins/addons/addressbook/class_addressbook.inc:526
-#: plugins/admin/users/class_userManagement.inc:425
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:501
 msgid "The required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:888
+#: plugins/personal/generic/class_user.inc:896
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/personal/generic/class_user.inc:894
-#: plugins/addons/addressbook/class_addressbook.inc:530
-#: plugins/admin/users/class_userManagement.inc:428
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:504
 msgid "The required field 'Given name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:897
+#: plugins/personal/generic/class_user.inc:905
 msgid "The required field 'Login' is not set."
 msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:904
+#: plugins/personal/generic/class_user.inc:912
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1600,7 +1600,7 @@ msgstr ""
 "Пользователь с такой комбинацией имени и личного имени в базе данных уже "
 "существует."
 
-#: plugins/personal/generic/class_user.inc:911
+#: plugins/personal/generic/class_user.inc:919
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1608,50 +1608,50 @@ msgstr ""
 "Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
 "Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/personal/generic/class_user.inc:914
+#: plugins/personal/generic/class_user.inc:922
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
 
-#: plugins/personal/generic/class_user.inc:917
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:536
-#: plugins/addons/addressbook/class_addressbook.inc:564
-#: plugins/admin/departments/class_departmentGeneric.inc:155
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
 msgid "The field 'Name' contains invalid characters."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/personal/generic/class_user.inc:920
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:539
-#: plugins/addons/addressbook/class_addressbook.inc:561
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
 msgid "The field 'Given name' contains invalid characters."
 msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
 
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/addons/addressbook/class_addressbook.inc:544
-#: plugins/addons/addressbook/class_addressbook.inc:547
-#: plugins/admin/departments/class_departmentGeneric.inc:158
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
 
-#: plugins/personal/generic/class_user.inc:931
-#: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/departments/class_departmentGeneric.inc:161
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
 
-#: plugins/personal/generic/class_user.inc:934
-#: plugins/addons/addressbook/class_addressbook.inc:553
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
 
-#: plugins/personal/generic/class_user.inc:937
-#: plugins/addons/addressbook/class_addressbook.inc:556
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1062
+#: plugins/personal/generic/class_user.inc:1070
 #, fuzzy
 msgid "Could not open specified certificate!"
 msgstr "Невозможно выбрать базу данных!"
@@ -1681,16 +1681,16 @@ msgstr "Сменить изображение"
 
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_edit.tpl:20
+#: plugins/addons/addressbook/address_edit.tpl:22
 #: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Фамилия"
 
 #: plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr "Имя"
@@ -1700,7 +1700,7 @@ msgid "Login"
 msgstr "Имя пользователя"
 
 #: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:26
+#: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Обращение"
@@ -1742,8 +1742,8 @@ msgstr "Выберите ветку для пользователя"
 
 #: plugins/personal/generic/generic.tpl:111
 #: plugins/personal/generic/generic.tpl:255
-#: plugins/addons/addressbook/address_edit.tpl:37
-#: plugins/addons/addressbook/address_edit.tpl:86
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_edit.tpl:93
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:54
@@ -1788,8 +1788,16 @@ msgid "Organization"
 msgstr "Организация"
 
 #: plugins/personal/generic/generic.tpl:177
-#: plugins/addons/addressbook/address_edit.tpl:68
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/groups/class_groupManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:364
+#: plugins/admin/systems/class_systemManagement.inc:553
+#: plugins/admin/ogroups/class_ogroupManagement.inc:411
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Подразделение"
@@ -1813,13 +1821,13 @@ msgstr "Номер комнаты"
 
 #: plugins/personal/generic/generic.tpl:221
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Мобильный"
 
 #: plugins/personal/generic/generic.tpl:225
-#: plugins/addons/addressbook/address_edit.tpl:95
+#: plugins/addons/addressbook/address_edit.tpl:102
 #: plugins/addons/addressbook/address_info.tpl:91
 msgid "Pager"
 msgstr "Пейджер"
@@ -1869,7 +1877,7 @@ msgid "Street"
 msgstr "Улица"
 
 #: plugins/personal/generic/generic.tpl:329
-#: plugins/addons/addressbook/address_edit.tpl:74
+#: plugins/addons/addressbook/address_edit.tpl:81
 #: plugins/addons/addressbook/address_info.tpl:70
 msgid "Postal code"
 msgstr "Почтовый индекс"
@@ -1886,7 +1894,7 @@ msgstr "Воспользуйтесь закладкой \"Телефон\""
 msgid "Last delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/generic/generic.tpl:378
+#: plugins/personal/generic/generic.tpl:377
 msgid "Public visible"
 msgstr "Видимый всем"
 
@@ -1895,7 +1903,7 @@ msgid "Remove picture"
 msgstr "Удалить изображение"
 
 #: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:107
+#: plugins/addons/addressbook/address_edit.tpl:114
 msgid "Save"
 msgstr "Сохранить"
 
@@ -1909,7 +1917,7 @@ msgstr "Стандартный сертификат"
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:377
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:635
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Удалить"
@@ -1981,7 +1989,7 @@ msgstr "Ограничить доступ к прокси рабочим вре
 msgid "Restrict proxy usage by quota"
 msgstr "Ограничить квотой использование прокси"
 
-#: plugins/personal/connectivity/proxy.tpl:79
+#: plugins/personal/connectivity/proxy.tpl:80
 msgid "per"
 msgstr "per"
 
@@ -2133,18 +2141,18 @@ msgstr ""
 "атрибуты POSIX, включите сначала их использование."
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:774
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
 #, fuzzy
 msgid "Couldn't Connect To Postgresql Database"
 msgstr "Невозможно подключиться к серверу базы данных!"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:778
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
 msgid "Needed Parameters to openexchange connectivity plugin failed!"
 msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:782
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
 #, fuzzy
 msgid "PHP4 module for Postgresql Database Failed!"
 msgstr "Невозможно выполнить запрос к базе данных журналов!"
@@ -2233,6 +2241,11 @@ msgstr "Информация"
 msgid "User Timezone"
 msgstr ""
 
+#: plugins/personal/connectivity/intranet.tpl:1
+#, fuzzy
+msgid "Intranet account"
+msgstr "Создать телефонный аккаунт"
+
 #: plugins/personal/connectivity/class_connectivity.inc:60
 msgid "This account has no connectivity extensions."
 msgstr "В этой учетной записи нет атрибутов для подключения."
@@ -2275,6 +2288,10 @@ msgstr ""
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
 msgstr "Список"
@@ -2289,7 +2306,7 @@ msgstr "Выберите ветку стоп-листа"
 
 #: plugins/gofax/blocklists/generic.tpl:32
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:112
+#: include/php_setup.inc:122
 msgid "Type"
 msgstr "Тип"
 
@@ -2318,13 +2335,13 @@ msgid "Blocked numbers"
 msgstr "Блокируемые номера"
 
 #: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:25
+#: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:26 plugins/admin/users/headpage.tpl:27
-#: plugins/admin/applications/headpage.tpl:25
-#: plugins/admin/departments/headpage.tpl:25
-#: plugins/admin/systems/headpage.tpl:25 plugins/admin/ogroups/headpage.tpl:26
-#: plugins/gofon/macro/headpage.tpl:25
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
 msgid "Information"
 msgstr "Информация"
 
@@ -2336,45 +2353,219 @@ msgstr "Вместо точных номеров можно использова
 msgid "FAX Blocklists"
 msgstr "Стоп-лист номеров (факсы)"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:121
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:204
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Вы собираетесь удалить стоп-лист '%s'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:135
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:218
 msgid "You have no permission to remove this blocklist."
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:153
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:236
 msgid "Please specify a valid phone number."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:358
+#: plugins/admin/users/class_userManagement.inc:620
+#: plugins/admin/applications/class_applicationManagement.inc:333
+#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/systems/class_systemManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#, fuzzy
+msgid "Go up one department"
+msgstr "Подразделение"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:358
+#: plugins/admin/users/class_userManagement.inc:620
+#: plugins/admin/applications/class_applicationManagement.inc:333
+#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/systems/class_systemManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+msgid "Up"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: plugins/admin/groups/class_groupManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:621
+#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:283
+#: plugins/admin/systems/class_systemManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:368
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#, fuzzy
+msgid "Go to root department"
+msgstr "Список подразделений"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
+#: plugins/admin/groups/class_groupManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:621
+#: plugins/admin/applications/class_applicationManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:283
+#: plugins/admin/systems/class_systemManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#, fuzzy
+msgid "Root"
+msgstr "Перезагрузить"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:622
+#: plugins/admin/applications/class_applicationManagement.inc:335
+#: plugins/admin/systems/class_systemManagement.inc:536
+#: plugins/admin/ogroups/class_ogroupManagement.inc:370
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+#, fuzzy
+msgid "Go to users department"
+msgstr "Выберите подразделение"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:361
+#: plugins/admin/users/class_userManagement.inc:622
+#: plugins/admin/applications/class_applicationManagement.inc:335
+#: plugins/admin/departments/class_departmentManagement.inc:284
+#: plugins/admin/systems/class_systemManagement.inc:536
+#: plugins/admin/ogroups/class_ogroupManagement.inc:371
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
+#, fuzzy
+msgid "Home"
+msgstr "Имя системы"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#, fuzzy
+msgid "Create new blocklist"
+msgstr "Имя стоп-листа"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#, fuzzy
+msgid "New Blocklist"
+msgstr "\"Черные списки\""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
+#: plugins/admin/groups/class_groupManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:627
+#: plugins/admin/applications/class_applicationManagement.inc:339
+#: plugins/admin/departments/class_departmentManagement.inc:288
+#: plugins/admin/systems/class_systemManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:375
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#, fuzzy
+msgid "Current base"
+msgstr "Текущий пароль"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/admin/groups/class_groupManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/applications/class_applicationManagement.inc:340
+#: plugins/admin/departments/class_departmentManagement.inc:289
+#: plugins/admin/systems/class_systemManagement.inc:541
+#: plugins/admin/ogroups/class_ogroupManagement.inc:376
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#, fuzzy
+msgid "Submit department"
+msgstr "Показать подразделения"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
+#: plugins/admin/groups/class_groupManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/applications/class_applicationManagement.inc:340
+#: plugins/admin/departments/class_departmentManagement.inc:289
+#: plugins/admin/systems/class_systemManagement.inc:541
+#: plugins/admin/ogroups/class_ogroupManagement.inc:376
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/admin/groups/class_groupManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/applications/class_applicationManagement.inc:344
+#: plugins/admin/departments/class_departmentManagement.inc:296
+#: plugins/admin/systems/class_systemManagement.inc:546
+#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#, fuzzy
+msgid "edit"
+msgstr "Изменить"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
+#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#, fuzzy
+msgid "Edit user"
+msgstr "Пользователи домена"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:302
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:633
+#: plugins/admin/applications/class_applicationManagement.inc:345
+#: plugins/admin/departments/class_departmentManagement.inc:297
+#: plugins/admin/systems/class_systemManagement.inc:547
+#: plugins/admin/ogroups/class_ogroupManagement.inc:381
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#, fuzzy
+msgid "delete"
+msgstr "Удалить"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:302
+#: plugins/admin/users/class_userManagement.inc:633
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#, fuzzy
+msgid "Delete user"
+msgstr "Удалить"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#, fuzzy
+msgid "Blocklist name"
+msgstr "Управление \"черными списками\""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
+#: plugins/addons/addressbook/contents.tpl:42
+#: plugins/admin/groups/class_groupManagement.inc:396
+#: plugins/admin/users/class_userManagement.inc:642
+#: plugins/admin/applications/class_applicationManagement.inc:365
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/ogroups/class_ogroupManagement.inc:402
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
+msgid "Actions"
+msgstr "Действия"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+msgid "This table displays faxblocklists for the selected tree."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:368
 msgid "send"
 msgstr "отправка"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:368
 msgid "receive"
 msgstr "получение"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:348
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:515
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "У вас недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:354
-#: plugins/admin/departments/class_departmentGeneric.inc:143
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/admin/departments/class_departmentGeneric.inc:147
 msgid "Required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:357
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 msgid "Required field 'Name' contains invalid characters"
 msgstr "Значение поля 'Имя' содержит недопустимые символы."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:365
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:532
 msgid "Specified name is already used."
 msgstr "Указанное имя уже используется."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:372
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:539
 msgid "No permission to create a blocklist on this base."
 msgstr "Недостаточно прав для создания стоп-листа в этой ветке."
 
@@ -2412,16 +2603,7 @@ msgstr ""
 msgid "List of blocklists"
 msgstr "Стоп-листы"
 
-#: plugins/gofax/blocklists/headpage.tpl:16
-#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:16
-#: plugins/admin/applications/headpage.tpl:16
-#: plugins/admin/departments/headpage.tpl:16
-#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:16
-#: plugins/gofon/macro/headpage.tpl:16
-msgid "New"
-msgstr "Создать"
-
-#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/blocklists/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to create, delete and edit selected blocklists. Having "
@@ -2432,50 +2614,35 @@ msgstr ""
 "листы. Если у вас достаточно большое количество списков, вы можете "
 "использовать групповое выделение."
 
-#: plugins/gofax/blocklists/headpage.tpl:32
-#, fuzzy
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you when performing "
-"changes on your blocklist. -Delete- will ask you for confirmation before "
-"really deleting anything."
-msgstr ""
-"При изменении и создании стоп-листов появится интерактивный помощник для "
-"редактирования их свойств. Перед удалением списка вам нужно будет "
-"подтвердить свое решение."
-
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Select to see send blocklists"
 msgstr "Выберите, чтобы просмотреть стоп-листы (отправка)"
 
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Show send blocklists"
 msgstr "Показать стоп-листы отправки"
 
-#: plugins/gofax/blocklists/headpage.tpl:47
+#: plugins/gofax/blocklists/headpage.tpl:39
 msgid "Select to see receive blocklists"
 msgstr "Выберите, чтобы просмотреть стоп-листы (получение)"
 
-#: plugins/gofax/blocklists/headpage.tpl:47
+#: plugins/gofax/blocklists/headpage.tpl:39
 msgid "Show receive blocklists"
 msgstr "Показать стоп-листы получения"
 
-#: plugins/gofax/blocklists/headpage.tpl:55
-msgid "Display lists of department"
-msgstr "Стоп-листы в подразделении"
-
-#: plugins/gofax/blocklists/headpage.tpl:69
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Display lists matching"
 msgstr "Шаблон для стоп-листов"
 
-#: plugins/gofax/blocklists/headpage.tpl:72
+#: plugins/gofax/blocklists/headpage.tpl:51
 msgid "Regular expression for matching list names"
 msgstr "Регулярное выражение, соответствующее именам списков"
 
-#: plugins/gofax/blocklists/headpage.tpl:80
+#: plugins/gofax/blocklists/headpage.tpl:62
 msgid "Display lists containing"
 msgstr "Шаблон для содержимого стоп-листов"
 
-#: plugins/gofax/blocklists/headpage.tpl:83
+#: plugins/gofax/blocklists/headpage.tpl:65
 msgid "Show lists containing entered numbers"
 msgstr "Показать \"черные списки\", содержащие введенные номера"
 
@@ -2585,7 +2752,7 @@ msgstr "Готовые \"черные списки\""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1195
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1260
 msgid "Apply"
 msgstr "Применить"
 
@@ -2594,7 +2761,7 @@ msgid "FAX settings"
 msgstr "Настройки факса"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:92
+#: plugins/addons/addressbook/address_edit.tpl:99
 #: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
@@ -2649,6 +2816,12 @@ msgstr ""
 msgid "The mail address you've entered is invalid."
 msgstr "Введенный вами адрес уже используется."
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:490
+msgid ""
+"Deliver fax to printer, is only possible if valid printer is given. Please "
+"correct your choice."
+msgstr ""
+
 #: plugins/gofax/reports/detail.tpl:6
 msgid "FAX preview - please wait"
 msgstr "Предварительный просмотр - пожалуйста, подождите"
@@ -2662,6 +2835,7 @@ msgid "FAX ID"
 msgstr "Идентификатор факса"
 
 #: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
+#: plugins/admin/ogroups/class_ogroupManagement.inc:476
 msgid "User"
 msgstr "Пользователь"
 
@@ -2703,7 +2877,7 @@ msgid "Filter"
 msgstr "Фильтр"
 
 #: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:92
+#: plugins/addons/addressbook/contents.tpl:102
 #: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
 msgid "Search for"
 msgstr "Поиск"
@@ -2786,7 +2960,7 @@ msgid "FAX reports"
 msgstr "Отчеты о факсах"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Личный"
@@ -2806,10 +2980,6 @@ msgstr ""
 "например, \"И*н\", чтобы найти имя \"Иван\". Уточнить результаты поиска "
 "можно с помощью фильтров ниже."
 
-#: plugins/addons/addressbook/contents.tpl:42
-msgid "Actions"
-msgstr "Действия"
-
 #: plugins/addons/addressbook/contents.tpl:47
 msgid "Add entry"
 msgstr "Добавить объект"
@@ -2838,22 +3008,22 @@ msgstr "Выберите, чтобы просмотреть пользовате
 msgid "Show addressbook entries"
 msgstr "Показать объекты адресной книги"
 
-#: plugins/addons/addressbook/contents.tpl:78
+#: plugins/addons/addressbook/contents.tpl:77
 msgid "Display results for department"
 msgstr "Показать результаты для подразделения"
 
-#: plugins/addons/addressbook/contents.tpl:95
-msgid "Search string"
-msgstr "Строка поиска"
-
-#: plugins/addons/addressbook/contents.tpl:103
+#: plugins/addons/addressbook/contents.tpl:90
 msgid "Match object"
 msgstr "Соответствующий объект"
 
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:93
 msgid "Choose the object that will be searched in"
 msgstr "Выберите объект, в котором будет осуществлен поиск"
 
+#: plugins/addons/addressbook/contents.tpl:105
+msgid "Search string"
+msgstr "Строка поиска"
+
 #: plugins/addons/addressbook/dial.tpl:3
 msgid "Dial connection..."
 msgstr "Соединение..."
@@ -2862,45 +3032,45 @@ msgstr "Соединение..."
 #: plugins/addons/addressbook/class_addressbook.inc:359
 #: plugins/addons/addressbook/class_addressbook.inc:366
 #: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:453
+#: plugins/addons/addressbook/class_addressbook.inc:454
 msgid "Dial"
 msgstr "Звонок"
 
-#: plugins/addons/addressbook/address_edit.tpl:4
+#: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr "Выбрать раздел, для хранения объекта"
 
-#: plugins/addons/addressbook/address_edit.tpl:16
+#: plugins/addons/addressbook/address_edit.tpl:18
 #: plugins/addons/addressbook/address_info.tpl:12
 msgid "Personal"
 msgstr "Контакт"
 
-#: plugins/addons/addressbook/address_edit.tpl:23
+#: plugins/addons/addressbook/address_edit.tpl:29
 #: plugins/addons/addressbook/address_info.tpl:19
 msgid "Initials"
 msgstr "Отчество"
 
-#: plugins/addons/addressbook/address_edit.tpl:47
+#: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:43
 msgid "Email"
 msgstr "Email"
 
-#: plugins/addons/addressbook/address_edit.tpl:57
+#: plugins/addons/addressbook/address_edit.tpl:64
 #: plugins/addons/addressbook/address_info.tpl:53
 msgid "Organizational"
 msgstr "Организация"
 
-#: plugins/addons/addressbook/address_edit.tpl:65
+#: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_info.tpl:61
 msgid "Company"
 msgstr "Компания"
 
-#: plugins/addons/addressbook/address_edit.tpl:71
+#: plugins/addons/addressbook/address_edit.tpl:78
 #: plugins/addons/addressbook/address_info.tpl:67
 msgid "City"
 msgstr "Город"
 
-#: plugins/addons/addressbook/address_edit.tpl:77
+#: plugins/addons/addressbook/address_edit.tpl:84
 #: plugins/addons/addressbook/address_info.tpl:73
 msgid "Country"
 msgstr "Страна"
@@ -2954,52 +3124,52 @@ msgstr "Сохранить контактную информацию %s в фо
 msgid "Send mail to %s"
 msgstr "Отправить %s сообщение по эл. почте"
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:466
 msgid "global addressbook"
 msgstr "общая адресная книга"
 
-#: plugins/addons/addressbook/class_addressbook.inc:468
+#: plugins/addons/addressbook/class_addressbook.inc:469
 msgid "organizations user database"
 msgstr "база пользователя"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:473
 #, php-format
 msgid "Contact stored in %s"
 msgstr "Контакт сохранен в %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:474
+#: plugins/addons/addressbook/class_addressbook.inc:475
 msgid "Creating new entry in"
 msgstr "Создание нового объекта в"
 
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/addons/logview/class_logview.inc:63
 #: plugins/addons/logview/class_logview.inc:77
 msgid "All"
 msgstr "Все"
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Work phone"
 msgstr "Рабочий телефон"
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Cell phone"
 msgstr "Сотовый телефон"
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:506
 msgid "Home phone"
 msgstr "Домашний телефон"
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:506
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
-#: plugins/addons/addressbook/class_addressbook.inc:577
+#: plugins/addons/addressbook/class_addressbook.inc:578
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Невозможно создать уникальный DN для объекта. Заполните все поля формы."
 
-#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/addons/addressbook/class_addressbook.inc:590
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3043,22 +3213,22 @@ msgstr ""
 msgid "Nothing to import!"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:299
-#: plugins/addons/ldapmanager/class_csvimport.inc:310
-#: plugins/addons/ldapmanager/class_csvimport.inc:315
-#: plugins/addons/ldapmanager/class_import.inc:58
-#: plugins/addons/ldapmanager/class_import.inc:66
+#: plugins/addons/ldapmanager/class_csvimport.inc:302
+#: plugins/addons/ldapmanager/class_csvimport.inc:313
+#: plugins/addons/ldapmanager/class_csvimport.inc:318
+#: plugins/addons/ldapmanager/class_import.inc:59
+#: plugins/addons/ldapmanager/class_import.inc:67
 #, fuzzy
 msgid "There is no file uploaded."
 msgstr "Файл небыл загружен"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:304
-#: plugins/addons/ldapmanager/class_import.inc:51
+#: plugins/addons/ldapmanager/class_csvimport.inc:307
+#: plugins/addons/ldapmanager/class_import.inc:52
 #, fuzzy
 msgid "The specified file is empty."
 msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:442
+#: plugins/addons/ldapmanager/class_csvimport.inc:446
 msgid "The selected file does not contain any CSV Data..."
 msgstr ""
 
@@ -3136,7 +3306,7 @@ msgstr "Выберите режим терминала"
 msgid "You've no permission to do LDAP imports."
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: plugins/addons/ldapmanager/class_import.inc:104
+#: plugins/addons/ldapmanager/class_import.inc:105
 msgid "Unknown Error"
 msgstr ""
 
@@ -3296,37 +3466,37 @@ msgstr "Просмотр системного журнала"
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:155
 msgid "This 'dn' is no group."
 msgstr "Это DN соответствует не группе."
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
+#: plugins/admin/groups/class_groupGeneric.inc:260
 msgid "Samba group"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
+#: plugins/admin/groups/class_groupGeneric.inc:260
 msgid "Domain admins"
 msgstr "Администраторы домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
+#: plugins/admin/groups/class_groupGeneric.inc:260
 msgid "Domain users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:254
+#: plugins/admin/groups/class_groupGeneric.inc:261
 msgid "Domain guests"
 msgstr "Непривилегированные пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:259
+#: plugins/admin/groups/class_groupGeneric.inc:266
 #, php-format
 msgid "Special group (%d)"
 msgstr "Специальная группа (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:574
-#: plugins/admin/ogroups/class_ogroup.inc:490
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:488
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "У вас недостаточно прав для создания группы в этой ветке."
 
-#: plugins/admin/groups/class_groupGeneric.inc:584
+#: plugins/admin/groups/class_groupGeneric.inc:591
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -3334,8 +3504,8 @@ msgstr ""
 "Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
 "буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/admin/groups/class_groupGeneric.inc:595
 #: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
 msgid "Value specified as 'Name' is already used."
 msgstr "Группа с таким именем уже существует."
 
@@ -3367,7 +3537,7 @@ msgstr "Пересылать сообщения не членам группы"
 msgid "List of groups"
 msgstr "Список групп"
 
-#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/headpage.tpl:25
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit and remove selected groups. You may want "
@@ -3378,24 +3548,6 @@ msgstr ""
 "группы пользователей. Если у вас их достаточно большое количество, вы можете "
 "использовать групповое выделение."
 
-#: plugins/admin/groups/headpage.tpl:33 plugins/admin/ogroups/headpage.tpl:33
-#, fuzzy
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing group "
-"properties. -Delete- will ask for confirmation before removing groups."
-msgstr ""
-"При изменении и создании групп появится интерактивный помощник для "
-"редактирования их свойств. Перед удалением групп вам нужно будет подтвердить "
-"свое решение."
-
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
-msgid "Dive into LDAP subtrees when searching"
-msgstr "Искать в поддеревьях LDAP"
-
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
-msgid "Search in subtrees"
-msgstr "Искать в поддеревьях"
-
 #: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
 msgid "Group administration"
 msgstr "Управление группами"
@@ -3405,16 +3557,76 @@ msgstr "Управление группами"
 msgid "Groups"
 msgstr "Группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:204
+#: plugins/admin/groups/class_groupManagement.inc:283
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/admin/groups/class_groupManagement.inc:210
-#: plugins/admin/groups/class_groupManagement.inc:236
+#: plugins/admin/groups/class_groupManagement.inc:289
+#: plugins/admin/groups/class_groupManagement.inc:315
 msgid "You are not allowed to delete this group!"
 msgstr "У вас недостаточно прав для удаления этой группы!"
 
+#: plugins/admin/groups/class_groupManagement.inc:363
+#, fuzzy
+msgid "Create new group"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "New"
+msgstr "Создать"
+
+#: plugins/admin/groups/class_groupManagement.inc:371
+#: plugins/admin/applications/class_applicationManagement.inc:344
+#: plugins/admin/departments/class_departmentManagement.inc:296
+#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+#, fuzzy
+msgid "Edit this entry"
+msgstr "Редактиовать объект"
+
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/applications/class_applicationManagement.inc:345
+#: plugins/admin/departments/class_departmentManagement.inc:297
+#: plugins/admin/ogroups/class_ogroupManagement.inc:381
+#, fuzzy
+msgid "Delete this entry"
+msgstr "Удалить"
+
+#: plugins/admin/groups/class_groupManagement.inc:382
+#: plugins/admin/users/class_userManagement.inc:664
+#, fuzzy
+msgid "Posix"
+msgstr "Прокси-сервер"
+
+#: plugins/admin/groups/class_groupManagement.inc:385
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:478
+#: plugins/gofon/reports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Приложение"
+
+#: plugins/admin/groups/class_groupManagement.inc:394
+#, fuzzy
+msgid "Groupname"
+msgstr "Группа"
+
+#: plugins/admin/groups/class_groupManagement.inc:395
+#: plugins/admin/users/class_userManagement.inc:641
+#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/systems/terminal.tpl:1
+#: plugins/admin/systems/workstation.tpl:1
+#: plugins/admin/ogroups/class_ogroupManagement.inc:401
+msgid "Properties"
+msgstr "Свойства"
+
+#: plugins/admin/groups/class_groupManagement.inc:400
+#: plugins/admin/applications/class_applicationManagement.inc:369
+#: plugins/admin/ogroups/class_ogroupManagement.inc:406
+msgid "This table displays all groups, in the selected tree."
+msgstr ""
+
 #: plugins/admin/groups/remove.tpl:7
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
@@ -3464,6 +3676,16 @@ msgstr "к списку тех, кому должны пересылаться 
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr "Введите корректное значение в поле \"Основной адрес\"."
 
+#: plugins/admin/groups/class_groupMail.inc:646
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:650
+#, fuzzy
+msgid "Please select a valid mail server."
+msgstr "Введите корректный серийный номер"
+
 #: plugins/admin/groups/acl.tpl:4
 msgid "Object"
 msgstr "Объект"
@@ -3492,18 +3714,17 @@ msgstr "Доступные приложения"
 msgid "Select users to add"
 msgstr "Выбрать пользователей для добавления"
 
-#: plugins/admin/groups/group_objects.tpl:26
-#: plugins/admin/users/headpage.tpl:67
+#: plugins/admin/groups/group_objects.tpl:30
 msgid "Display users of department"
 msgstr "Подразделение"
 
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/users/headpage.tpl:71
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
 msgid "Display users matching"
 msgstr "Фильтр"
 
-#: plugins/admin/groups/group_objects.tpl:31
-#: plugins/admin/users/headpage.tpl:72
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
 msgid "Regular expression for matching user names"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
@@ -3602,6 +3823,11 @@ msgstr ""
 msgid "The selected application has no options."
 msgstr "У выбранного приложения нет параметров."
 
+#: plugins/admin/groups/class_groupApplication.inc:278
+#, php-format
+msgid "The application named %s is no longer available and has been removed."
+msgstr ""
+
 #: plugins/admin/users/password.tpl:2
 #, fuzzy
 msgid ""
@@ -3628,7 +3854,8 @@ msgstr ""
 "использовать шаблоны."
 
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:618
+#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/systems/class_systemManagement.inc:661
 msgid "Template"
 msgstr "Шаблон"
 
@@ -3652,30 +3879,72 @@ msgstr "Управление пользователями"
 msgid "Users"
 msgstr "Пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:157
-#: plugins/admin/users/class_userManagement.inc:208
+#: plugins/admin/users/class_userManagement.inc:235
+#: plugins/admin/users/class_userManagement.inc:286
 msgid "You are not allowed to set this users password!"
 msgstr "У вас недостаточно прав для смены пароля этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:322
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Вы собираетесь удалить пользователя %s."
 
-#: plugins/admin/users/class_userManagement.inc:250
-#: plugins/admin/users/class_userManagement.inc:278
+#: plugins/admin/users/class_userManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:356
 msgid "You are not allowed to delete this user!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:368
-#: plugins/admin/ogroups/class_ogroup.inc:203
+#: plugins/admin/users/class_userManagement.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "нет"
 
-#: plugins/admin/users/class_userManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:513
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Пользователь с таким именем уже есть в этой ветке."
 
+#: plugins/admin/users/class_userManagement.inc:624
+#, fuzzy
+msgid "Create new user"
+msgstr "Создание нового объекта в"
+
+#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:538
+#, fuzzy
+msgid "New user"
+msgstr "пользователи"
+
+#: plugins/admin/users/class_userManagement.inc:625
+#, fuzzy
+msgid "Create new template"
+msgstr "Создать шаблон"
+
+#: plugins/admin/users/class_userManagement.inc:625
+msgid "New template"
+msgstr "Создать шаблон"
+
+#: plugins/admin/users/class_userManagement.inc:632
+#, fuzzy
+msgid "password"
+msgstr "Пароль"
+
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
+msgid "Username"
+msgstr "Имя пользователя"
+
+#: plugins/admin/users/class_userManagement.inc:645
+msgid "This table displays all users, in the selected tree."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:663
+msgid "GOsa"
+msgstr ""
+
 #: plugins/admin/users/remove.tpl:7
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -3691,11 +3960,7 @@ msgstr ""
 msgid "List of users"
 msgstr "Список пользователей"
 
-#: plugins/admin/users/headpage.tpl:17
-msgid "New template"
-msgstr "Создать шаблон"
-
-#: plugins/admin/users/headpage.tpl:31
+#: plugins/admin/users/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to create, edit and delete selected users. Having a "
@@ -3706,68 +3971,59 @@ msgstr ""
 "пользователей. Если у вас достаточно большое количество пользователей, вы "
 "можете использовать групповое выделение."
 
-#: plugins/admin/users/headpage.tpl:34
-#, fuzzy
-msgid ""
-"-Edit- and -New...- execute an assistant to aid you in managing your account "
-"informations. -Delete- will ask for confirmation before deleting users."
-msgstr ""
-"При изменении и создании пользователей появится интерактивный помощник для "
-"редактирования их учетных записей. Перед удалением пользователей с сервера "
-"LDAP вам нужно будет подтвердить свое решение."
-
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/headpage.tpl:38
 msgid "Select to see template pseudo users"
 msgstr "Выберите, чтобы просмотреть шаблоны псевдопользователей"
 
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/headpage.tpl:38
 msgid "Show templates"
 msgstr "Показать шаблоны"
 
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:39
 msgid "Select to see users that have only a GOsa object"
 msgstr ""
 "Выберите, чтобы просмотреть пользователей, у которых есть только объект GOsa"
 
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:39
 msgid "Show functional users"
 msgstr "Показать обычных пользователей"
 
-#: plugins/admin/users/headpage.tpl:50
+#: plugins/admin/users/headpage.tpl:40
 msgid "Select to see users that have posix settings"
 msgstr ""
 "Выберите, чтобы просмотреть пользователей с атрибутами в стандарте POSIX"
 
-#: plugins/admin/users/headpage.tpl:50
+#: plugins/admin/users/headpage.tpl:40
 msgid "Show unix users"
 msgstr "Показать UNIX-пользователей"
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:41
 msgid "Select to see users that have mail settings"
 msgstr "Выберите, чтобы просмотреть пользователей с настройками почты"
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:41
 msgid "Show mail users"
 msgstr "Показать пользователей с почтой"
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:42
 msgid "Select to see users that have samba settings"
 msgstr "Выберите, чтобы просмотреть пользователей с настройками Samba"
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:42
 msgid "Show samba users"
 msgstr "Показать пользователей Samba"
 
-#: plugins/admin/users/headpage.tpl:53
+#: plugins/admin/users/headpage.tpl:43
 msgid "Select to see users that have proxy settings"
 msgstr "Выберите, чтобы просмотреть пользователей с настройками прокси-сервера"
 
-#: plugins/admin/users/headpage.tpl:53
+#: plugins/admin/users/headpage.tpl:43
 msgid "Show proxy users"
 msgstr "Показать пользователей с прокси-серверами"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationManagement.inc:364
 msgid "Application name"
 msgstr "Приложение"
 
@@ -3794,7 +4050,6 @@ msgstr ""
 "пиктограммами)"
 
 #: plugins/admin/applications/generic.tpl:35
-#: plugins/gofon/macro/generic.tpl:22
 msgid "Choose subtree to place application in"
 msgstr "Выберите ветку, куда нужно поместить приложение"
 
@@ -3878,7 +4133,7 @@ msgstr ""
 msgid "List of applications"
 msgstr "Список приложений"
 
-#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit and remove selected applications. You may "
@@ -3889,25 +4144,12 @@ msgstr ""
 "приложения. Если у вас достаточно большое количество приложений, вы можете "
 "использовать групповое выделение."
 
-#: plugins/admin/applications/headpage.tpl:32
-#, fuzzy
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing applications."
-msgstr ""
-"При изменении и создании приложений появится интерактивный помощник для "
-"редактирования свойств. Перед удалением приложений вам нужно будет "
-"подтвердить свое решение."
-
-#: plugins/admin/applications/headpage.tpl:46
-msgid "Display applications of department"
-msgstr "Приложения в подразделении"
-
-#: plugins/admin/applications/headpage.tpl:58
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Display applications matching"
 msgstr "Шаблон для приложений"
 
-#: plugins/admin/applications/headpage.tpl:61
+#: plugins/admin/applications/headpage.tpl:44
 msgid "Regular expression for matching application names"
 msgstr "Регулярное выражение, соответствующее именам приложений"
 
@@ -3916,47 +4158,51 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Application management"
 msgstr "Управление приложениями"
 
-#: plugins/admin/applications/class_applicationManagement.inc:185
+#: plugins/admin/applications/class_applicationManagement.inc:257
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Вы собираетесь удалить приложение \"%s\"."
 
-#: plugins/admin/applications/class_applicationManagement.inc:191
-#: plugins/admin/applications/class_applicationManagement.inc:217
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
+#: plugins/admin/applications/class_applicationManagement.inc:263
+#: plugins/admin/applications/class_applicationManagement.inc:289
 msgid "You are not allowed to delete this application!"
 msgstr "У вас недостаточно прав для удаления этого приложения!"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:59
+#: plugins/admin/applications/class_applicationManagement.inc:337
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
+#, fuzzy
+msgid "new"
+msgstr "Создать"
+
+#: plugins/admin/applications/class_applicationManagement.inc:337
+#, fuzzy
+msgid "Create new application"
+msgstr "Создать приложения"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr "Это DN соответствует не приложению."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:148
+#: plugins/admin/applications/class_applicationGeneric.inc:159
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Указанное изображение было загружено некорректно."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:229
+#: plugins/admin/applications/class_applicationGeneric.inc:240
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr "У вас недостаточно прав для создания приложения в этой ветке."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:234
+#: plugins/admin/applications/class_applicationGeneric.inc:245
 msgid "Required field 'Name' is not filled."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:237
+#: plugins/admin/applications/class_applicationGeneric.inc:248
 msgid "Required field 'Execute' is not filled."
 msgstr "Обязательное поле \"Выполнить\" не заполнено."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:246
+#: plugins/admin/applications/class_applicationGeneric.inc:257
 msgid "There's already an application with this 'Name'."
 msgstr "Приложение с таким именем уже существует."
 
-#: plugins/admin/departments/generic.tpl:4
-#: plugins/admin/systems/terminal.tpl:1
-#: plugins/admin/systems/workstation.tpl:1
-msgid "Properties"
-msgstr "Свойства"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Подразделение"
@@ -4025,7 +4271,7 @@ msgstr ""
 msgid "List of departments"
 msgstr "Список подразделений"
 
-#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
@@ -4036,26 +4282,12 @@ msgstr ""
 "подразделения. Если у вас достаточно большое количество подразделений, вы "
 "можете использовать групповое выделение."
 
-#: plugins/admin/departments/headpage.tpl:32
-#, fuzzy
-msgid ""
-"-Edit- and -New...- will provide an assistant to aid you when performing "
-"changes on your departments. -Delete- will ask for confirmation before "
-"deleting departments."
-msgstr ""
-"При изменении и создании подразделения появится интерактивный помощник для "
-"редактирования информации об этом подразделении. Перед удалением "
-"подразделения вам нужно будет подтвердить свое решение."
-
-#: plugins/admin/departments/headpage.tpl:45
-msgid "Display subdepartments of"
-msgstr "Подразделения в подразделении"
-
-#: plugins/admin/departments/headpage.tpl:56
+#: plugins/admin/departments/headpage.tpl:38
+#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr "Шаблон для подразделений"
 
-#: plugins/admin/departments/headpage.tpl:59
+#: plugins/admin/departments/headpage.tpl:45
 msgid "Regular expression for matching department names"
 msgstr "Регулярное выражение, соответствующее именам подразделений"
 
@@ -4065,36 +4297,65 @@ msgstr "Управление подразделениями"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
+#: plugins/admin/ogroups/class_ogroupManagement.inc:400
 msgid "Departments"
 msgstr "Подразделения"
 
-#: plugins/admin/departments/class_departmentManagement.inc:130
+#: plugins/admin/departments/class_departmentManagement.inc:190
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "Вы собираетесь удалить целую ветку LDAP с корнем в \"%s\"."
 
-#: plugins/admin/departments/class_departmentManagement.inc:145
+#: plugins/admin/departments/class_departmentManagement.inc:207
 msgid "You have no permission to remove this department."
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:129
+#: plugins/admin/departments/class_departmentManagement.inc:284
+#, fuzzy
+msgid "Go to users home department"
+msgstr "Подразделение"
+
+#: plugins/admin/departments/class_departmentManagement.inc:286
+#, fuzzy
+msgid "Create new department"
+msgstr "Подразделение"
+
+#: plugins/admin/departments/class_departmentManagement.inc:294
+msgid "This table displays all departments, in the selected tree."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:302
+#, fuzzy
+msgid "Department name"
+msgstr "Управление подразделениями"
+
+#: plugins/admin/departments/class_departmentManagement.inc:312
+#, fuzzy
+msgid "department"
+msgstr "подразделения"
+
+#: plugins/admin/departments/class_departmentManagement.inc:389
+msgid ".."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:133
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:136
-#: plugins/admin/departments/class_departmentGeneric.inc:138
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
 msgid "Department with that 'Name' already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:146
+#: plugins/admin/departments/class_departmentGeneric.inc:150
 msgid "Required field 'Description' is not set."
 msgstr "Обязательное поле \"Описание\" не заполнено."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:151
+#: plugins/admin/departments/class_departmentGeneric.inc:155
 msgid "The field 'Name' contains the reserved word 'incoming'."
 msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:152
+#: plugins/admin/departments/class_departmentGeneric.inc:156
 msgid " Please choose another name."
 msgstr " Введите другое имя."
 
@@ -4146,43 +4407,29 @@ msgstr "IP-адрес"
 msgid "MAC-address"
 msgstr "MAC-адрес"
 
-#: plugins/admin/systems/class_servService.inc:179
+#: plugins/admin/systems/class_servService.inc:177
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:72
+#: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 #, fuzzy
 msgid "This 'dn' has no network features."
 msgstr "Этот DN не имеет свойств принтера."
 
-#: plugins/admin/systems/class_winGeneric.inc:135
+#: plugins/admin/systems/class_winGeneric.inc:139
 #: plugins/admin/systems/class_componentGeneric.inc:110
 #, fuzzy
 msgid "The required field 'Component name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/admin/systems/class_winGeneric.inc:138
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:269
-#, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
-
-#: plugins/admin/systems/class_winGeneric.inc:141
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:272
-#, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
-
-#: plugins/admin/systems/class_winGeneric.inc:148
+#: plugins/admin/systems/class_winGeneric.inc:153
 #: plugins/admin/systems/class_componentGeneric.inc:123
 #, fuzzy
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
-#: plugins/admin/systems/class_winGeneric.inc:158
+#: plugins/admin/systems/class_winGeneric.inc:163
 #: plugins/admin/systems/class_terminalGeneric.inc:236
 #: plugins/admin/systems/class_servGeneric.inc:180
 #: plugins/admin/systems/class_workstationGeneric.inc:242
@@ -4632,42 +4879,159 @@ msgstr "Обязательное поле 'Название рабочей ст
 msgid "Systems"
 msgstr "Системы"
 
-#: plugins/admin/systems/class_systemManagement.inc:246
+#: plugins/admin/systems/class_systemManagement.inc:314
 msgid "You can't edit this object type yet!"
 msgstr "Вы не можете редактировать сейчас этот тип объекта!"
 
-#: plugins/admin/systems/class_systemManagement.inc:262
+#: plugins/admin/systems/class_systemManagement.inc:330
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "Введенные пароли не совпадают!"
 
-#: plugins/admin/systems/class_systemManagement.inc:275
+#: plugins/admin/systems/class_systemManagement.inc:343
 msgid "You are not allowed to set this systems password!"
 msgstr "У вас недостаточно прав для смены пароля этой системы!"
 
-#: plugins/admin/systems/class_systemManagement.inc:319
+#: plugins/admin/systems/class_systemManagement.inc:387
 #, fuzzy, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
 
-#: plugins/admin/systems/class_systemManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:378
+#: plugins/admin/systems/class_systemManagement.inc:393
+#: plugins/admin/systems/class_systemManagement.inc:446
 #, fuzzy
 msgid "You are not allowed to delete this component!"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/class_systemManagement.inc:644
+#: plugins/admin/systems/class_systemManagement.inc:538
+msgid "Create new system"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:546
+#, fuzzy
+msgid "Edit system"
+msgstr "Список систем"
+
+#: plugins/admin/systems/class_systemManagement.inc:547
+#, fuzzy
+msgid "Delete system"
+msgstr "Удалить"
+
+#: plugins/admin/systems/class_systemManagement.inc:553
+#, fuzzy
+msgid "System"
+msgstr "Системы"
+
+#: plugins/admin/systems/class_systemManagement.inc:557
+msgid "This table displays all systems, in the selected tree."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:577
+#, fuzzy
+msgid "Cups Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_systemManagement.inc:578
+msgid "Log Db"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:579
+#, fuzzy
+msgid "Syslog Server"
+msgstr "Сервер системных журналов"
+
+#: plugins/admin/systems/class_systemManagement.inc:580
+#, fuzzy
+msgid "Mail Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_systemManagement.inc:581
+#, fuzzy
+msgid "Imap Server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_systemManagement.inc:582
+#, fuzzy
+msgid "Nfs Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_systemManagement.inc:583
+#, fuzzy
+msgid "Kerberos Server"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_systemManagement.inc:584
+#, fuzzy
+msgid "Asterisk Server"
+msgstr "Терминальный сервер"
+
+#: plugins/admin/systems/class_systemManagement.inc:585
+#, fuzzy
+msgid "Fax Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_systemManagement.inc:586
+#, fuzzy
+msgid "Ldap Server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_systemManagement.inc:612
+#, fuzzy
+msgid "Set root password"
+msgstr "Изменить пароль"
+
+#: plugins/admin/systems/class_systemManagement.inc:662
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#, fuzzy
+msgid "Terminal"
+msgstr "Терминалы"
+
+#: plugins/admin/systems/class_systemManagement.inc:663
+#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Рабочая станция"
+
+#: plugins/admin/systems/class_systemManagement.inc:666
+#, fuzzy
+msgid "New Terminal"
+msgstr "Создать терминал"
+
+#: plugins/admin/systems/class_systemManagement.inc:667
+#, fuzzy
+msgid "New Workstation"
+msgstr "Новая рабочая станция"
+
+#: plugins/admin/systems/class_systemManagement.inc:668
+#, fuzzy
+msgid "Winstation"
+msgstr "Рабочая станция"
+
+#: plugins/admin/systems/class_systemManagement.inc:669
+#, fuzzy
+msgid "Network Device"
+msgstr "Сетевые устройства"
+
+#: plugins/admin/systems/class_systemManagement.inc:670
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
+msgstr "Принтер"
+
+#: plugins/admin/systems/class_systemManagement.inc:855
 msgid "New terminal"
 msgstr "Создать терминал"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
+#: plugins/admin/systems/class_systemManagement.inc:858
 msgid "New workstation"
 msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:663
-msgid "Thin client template for"
-msgstr "Шаблон тонкого клиента для"
+#: plugins/admin/systems/class_systemManagement.inc:875
+#, fuzzy
+msgid "Terminal template for"
+msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:886
 msgid "Workstation template for"
 msgstr "Шаблон рабочей станции для"
 
@@ -4780,12 +5144,12 @@ msgstr "база пользователя"
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:88
+#: plugins/admin/systems/class_servKolab.inc:112
 #, fuzzy
 msgid "Remove Kolab extension"
 msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_servKolab.inc:88
+#: plugins/admin/systems/class_servKolab.inc:112
 #, fuzzy
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
@@ -4794,12 +5158,12 @@ msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:91
+#: plugins/admin/systems/class_servKolab.inc:115
 #, fuzzy
 msgid "Add Kolab service"
 msgstr "Добавить сервис DNS"
 
-#: plugins/admin/systems/class_servKolab.inc:91
+#: plugins/admin/systems/class_servKolab.inc:115
 #, fuzzy
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
@@ -4808,41 +5172,41 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:119
+#: plugins/admin/systems/class_servKolab.inc:143
 #, php-format
 msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:125
+#: plugins/admin/systems/class_servKolab.inc:149
 #, php-format
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:197
+#: plugins/admin/systems/class_servKolab.inc:221
 msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:199
+#: plugins/admin/systems/class_servKolab.inc:223
 msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:203
+#: plugins/admin/systems/class_servKolab.inc:227
 msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:205
+#: plugins/admin/systems/class_servKolab.inc:229
 msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:207
+#: plugins/admin/systems/class_servKolab.inc:231
 msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:211
+#: plugins/admin/systems/class_servKolab.inc:235
 msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:215
+#: plugins/admin/systems/class_servKolab.inc:239
 msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
@@ -4905,23 +5269,27 @@ msgstr ""
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:138
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:142
+#: plugins/admin/systems/servkolab.tpl:144
 msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:147
+#: plugins/admin/systems/servkolab.tpl:149
 msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:161
+#: plugins/admin/systems/servkolab.tpl:163
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:167
+#: plugins/admin/systems/servkolab.tpl:169
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
@@ -4944,7 +5312,7 @@ msgstr ""
 msgid "List of systems"
 msgstr "Список систем"
 
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
@@ -4954,89 +5322,80 @@ msgstr ""
 "отдельных систем. Вы можете только добавлять системы которые однажды уже "
 "были запущены."
 
-#: plugins/admin/systems/headpage.tpl:32
-#, fuzzy
-msgid ""
-"-Edit- will execute an assistant to aid you in changing the system "
-"properties. -Delete- will ask for confirmation before deleting systems."
-msgstr ""
-"-Edit- запустит помошника который поможет Вам изменить настройки системы. -"
-"Delete- спросит вас прежде чем действительно удалить объект из каталога."
-
-#: plugins/admin/systems/headpage.tpl:46
+#: plugins/admin/systems/headpage.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Выберите, чтобы просмотреть серверы"
 
-#: plugins/admin/systems/headpage.tpl:46
+#: plugins/admin/systems/headpage.tpl:38
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Показать серверы"
 
-#: plugins/admin/systems/headpage.tpl:47
+#: plugins/admin/systems/headpage.tpl:39
 #, fuzzy
 msgid "Select to see Linux terminals"
 msgstr "Выберите чтобы посмотреть терминалы"
 
-#: plugins/admin/systems/headpage.tpl:47
+#: plugins/admin/systems/headpage.tpl:39
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Показать терминалы"
 
-#: plugins/admin/systems/headpage.tpl:48
+#: plugins/admin/systems/headpage.tpl:40
 #, fuzzy
 msgid "Select to see Linux workstations"
 msgstr "Выберите чтобы посмотреть рабочие станции"
 
-#: plugins/admin/systems/headpage.tpl:48
+#: plugins/admin/systems/headpage.tpl:40
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Показать рабочие станции"
 
-#: plugins/admin/systems/headpage.tpl:49
+#: plugins/admin/systems/headpage.tpl:41
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr "Посмотреть рабочие станции с MicroSoft Windows"
 
-#: plugins/admin/systems/headpage.tpl:49
+#: plugins/admin/systems/headpage.tpl:41
 msgid "Show windows based workstations"
 msgstr "Показать рабочие станции с windows"
 
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/headpage.tpl:42
 msgid "Select to see network printers"
 msgstr "Выберите чтобы посмотреть сетевые принтеры"
 
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/headpage.tpl:42
 msgid "Show network printers"
 msgstr "Показать сетевые принтеры"
 
-#: plugins/admin/systems/headpage.tpl:51
+#: plugins/admin/systems/headpage.tpl:43
 msgid "Select to see VOIP phones"
 msgstr "Выберите чтобы посмотреть VOIP телефоны"
 
-#: plugins/admin/systems/headpage.tpl:51
+#: plugins/admin/systems/headpage.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Показать телефоны"
 
-#: plugins/admin/systems/headpage.tpl:52
+#: plugins/admin/systems/headpage.tpl:44
 #, fuzzy
 msgid "Select to see network devices"
 msgstr "Выберите чтобы посмотреть сетевые принтеры"
 
-#: plugins/admin/systems/headpage.tpl:52
+#: plugins/admin/systems/headpage.tpl:44
 #, fuzzy
 msgid "Show network devices"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/headpage.tpl:74
+#: plugins/admin/systems/headpage.tpl:54
 msgid "Regular expression for matching system names"
 msgstr "Регулярное выражение, соответствующее именам систем"
 
-#: plugins/admin/systems/headpage.tpl:82
+#: plugins/admin/systems/headpage.tpl:62
 msgid "Display terminal(s) of user"
 msgstr "Показать терминал(ы) пользователя"
 
-#: plugins/admin/systems/headpage.tpl:85
+#: plugins/admin/systems/headpage.tpl:65
 msgid "User name of which terminal(s) are shown"
 msgstr "Имя пользователя, для которого перечисляются терминалы"
 
@@ -5220,6 +5579,18 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr "Изменение пароля влияет только на аутентификацию в системе."
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:269
+#, fuzzy
+msgid "The required field 'MAC-address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:272
+#, fuzzy
+msgid "The required field 'IP-address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+
 #: plugins/admin/systems/component.tpl:6
 #, fuzzy
 msgid "Device name"
@@ -5363,11 +5734,13 @@ msgid "This 'dn' has no phone features."
 msgstr "Этот DN не имеет свойств телефона."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:176
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:366
 #, fuzzy
 msgid "yes"
 msgstr "Системы"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:176
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:367
 #, fuzzy
 msgid "no"
 msgstr "нет"
@@ -5481,7 +5854,7 @@ msgstr ""
 msgid "Hosts that are not allowed to connect"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/phonesettings.tpl:212
+#: plugins/admin/systems/phonesettings.tpl:210
 msgid "MSN"
 msgstr ""
 
@@ -5569,63 +5942,63 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
-#: plugins/admin/ogroups/class_ogroup.inc:91
+#: plugins/admin/ogroups/class_ogroup.inc:95
 msgid "This 'dn' is no object group."
 msgstr "Этот объект не является группой."
 
-#: plugins/admin/ogroups/class_ogroup.inc:205
+#: plugins/admin/ogroups/class_ogroup.inc:203
 msgid "too many different objects!"
 msgstr "слишком много различных объектов!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:207
+#: plugins/admin/ogroups/class_ogroup.inc:205
 msgid "users"
 msgstr "пользователи"
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
+#: plugins/admin/ogroups/class_ogroup.inc:206
 msgid "groups"
 msgstr "группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
+#: plugins/admin/ogroups/class_ogroup.inc:207
 msgid "applications"
 msgstr "приложения"
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
+#: plugins/admin/ogroups/class_ogroup.inc:208
 msgid "departments"
 msgstr "подразделения"
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
+#: plugins/admin/ogroups/class_ogroup.inc:209
 msgid "servers"
 msgstr "серверы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
+#: plugins/admin/ogroups/class_ogroup.inc:210
 msgid "workstations"
 msgstr "рабочие станции"
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
+#: plugins/admin/ogroups/class_ogroup.inc:211
 msgid "terminals"
 msgstr "терминалы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:214
+#: plugins/admin/ogroups/class_ogroup.inc:212
 msgid "phones"
 msgstr "телефоны"
 
-#: plugins/admin/ogroups/class_ogroup.inc:215
+#: plugins/admin/ogroups/class_ogroup.inc:213
 msgid "printers"
 msgstr "принтеры"
 
-#: plugins/admin/ogroups/class_ogroup.inc:222
+#: plugins/admin/ogroups/class_ogroup.inc:220
 msgid "and"
 msgstr "и"
 
-#: plugins/admin/ogroups/class_ogroup.inc:369
+#: plugins/admin/ogroups/class_ogroup.inc:367
 msgid "Non existing dn: "
 msgstr "Не существующий dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/ogroups/class_ogroup.inc:498
 msgid "Object groups need at least one member!"
 msgstr "В группе должно быть не менее одного участника!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:505
+#: plugins/admin/ogroups/class_ogroup.inc:503
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 "Вы можете комбинировать не более двух различных классов в одном объекте!"
@@ -5651,21 +6024,36 @@ msgstr "Тонкие клиенты"
 msgid "Workstations"
 msgstr "Рабочие станции"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/generic/references/class_reference.inc:52
-msgid "Printer"
-msgstr "Принтер"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:149
+#: plugins/admin/ogroups/class_ogroupManagement.inc:226
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr "Вы собираетесь удалить групповой объект \"%s\"."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:155
-#: plugins/admin/ogroups/class_ogroupManagement.inc:181
+#: plugins/admin/ogroups/class_ogroupManagement.inc:232
+#: plugins/admin/ogroups/class_ogroupManagement.inc:258
 msgid "You are not allowed to delete this object group!"
 msgstr "У вас недостаточно прав для удаления этого группового объекта!"
 
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
+#, fuzzy
+msgid "Create new object group"
+msgstr "Объект группы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:400
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Название группы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:435
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Объект группы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:477
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Группа"
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Название группы"
@@ -5682,7 +6070,7 @@ msgstr ""
 "Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
 "сможет восстановить эти данные."
 
-#: plugins/admin/ogroups/headpage.tpl:30
+#: plugins/admin/ogroups/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit or remove selected groups. You may want to "
@@ -5693,38 +6081,43 @@ msgstr ""
 "группы пользователей. Если у вас их достаточно большое количество, вы можете "
 "использовать групповое выделение."
 
-#: plugins/admin/ogroups/headpage.tpl:48
+#: plugins/admin/ogroups/headpage.tpl:39
 msgid "Show groups containing users"
 msgstr "Показать группы с пользователями"
 
-#: plugins/admin/ogroups/headpage.tpl:49
+#: plugins/admin/ogroups/headpage.tpl:40
 msgid "Show groups containing groups"
 msgstr "Показать группы с группами"
 
-#: plugins/admin/ogroups/headpage.tpl:50
+#: plugins/admin/ogroups/headpage.tpl:41
 msgid "Show groups containing applications"
 msgstr "Показать группы с приложениями"
 
-#: plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/ogroups/headpage.tpl:42
 msgid "Show groups containing departments"
 msgstr "Показать группы с подразделениями"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:43
 msgid "Show groups containing servers"
 msgstr "Показать группы с серверами"
 
-#: plugins/admin/ogroups/headpage.tpl:53
+#: plugins/admin/ogroups/headpage.tpl:44
 msgid "Show groups containing workstations"
 msgstr "Показать группы с рабочими станциями"
 
-#: plugins/admin/ogroups/headpage.tpl:54
+#: plugins/admin/ogroups/headpage.tpl:45
 msgid "Show groups containing terminals"
 msgstr "Показать группы с терминалами"
 
-#: plugins/admin/ogroups/headpage.tpl:55
+#: plugins/admin/ogroups/headpage.tpl:46
 msgid "Show groups containing printers"
 msgstr "Показать группы с принтерами"
 
+#: plugins/admin/ogroups/headpage.tpl:52
+#, fuzzy
+msgid "Display object groups matching"
+msgstr "Показать совпадения объектов"
+
 #: plugins/admin/ogroups/mail.tpl:7
 msgid "Mail distribution list"
 msgstr ""
@@ -5754,31 +6147,51 @@ msgstr ""
 msgid "Phone settings"
 msgstr "Настройки телефона"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
 #, fuzzy
 msgid "no macro"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
 #, fuzzy
 msgid "undefined"
 msgstr "не определена"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:868
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:223
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:879
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#, fuzzy, php-format
+msgid "Can't select database %s on %s."
+msgstr "Невозможно выбрать базу данных!"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:432
+msgid "Error while performing query "
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:467
 msgid ""
 "The macro you selected in the past, is no longer available for you, please "
 "choose another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:538
 msgid "This account has no phone extensions."
 msgstr "В этой учетной записи нет атрибутов для телефона."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:548
 msgid "Remove phone account"
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:549
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -5786,11 +6199,11 @@ msgstr ""
 "В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
 "щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:551
 msgid "Create phone account"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:552
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -5798,45 +6211,49 @@ msgstr ""
 "В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
 "щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:564
 msgid "Please enter a valid phone number!"
 msgstr "Введите корректный номер телефона!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:602
 msgid "Choose your private phone"
 msgstr "Укажите личный телефон"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:716
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "Необходимо указать не менее одного телефонного номера!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:461
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:723
 #, php-format
 msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:725
 #, php-format
 msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:740
 #, php-format
 msgid "The number '%s' is no valid phone number!"
 msgstr "Неправильный номер телефона '%s'"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:481
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:743
 #, php-format
 msgid "The timeout '%s' contains invalid characters!"
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:277
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:323
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "Неправильное указание таймаута '%s'"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:902
+msgid "Stop"
+msgstr ""
+
 #: plugins/gofon/phoneaccount/generic.tpl:1
 #: plugins/gofon/phoneaccount/generic.tpl:4
 msgid "Phone numbers"
@@ -5894,11 +6311,6 @@ msgstr "Назначение"
 msgid "Channel"
 msgstr "Канал"
 
-#: plugins/gofon/reports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Приложение"
-
 #: plugins/gofon/reports/contents.tpl:36
 msgid "Duration"
 msgstr "Продолжительность"
@@ -5907,25 +6319,66 @@ msgstr "Продолжительность"
 msgid "Phone reports"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:58
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:153
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:185
 #, fuzzy
 msgid "This 'dn' is no phone macro."
 msgstr "Этот DN не имеет свойств телефона."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:136
+#: plugins/gofon/macro/class_gofonMacro.inc:147
+msgid ""
+"This macro ist still in use. To delete this Macro ensure that nobody has "
+"selected this Macro."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#, php-format
+msgid "Unable to parse macro contents on line: %s"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:250
+#, php-format
+msgid "Can't perform SELECT query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:259
+#: plugins/gofon/macro/class_gofonMacro.inc:267
+#, php-format
+msgid "Can't perform DELETE query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:281
+#, php-format
+msgid "Can't perform INSERT query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:323
+#, fuzzy, php-format
+msgid "The given cn '%s' already exists."
+msgstr "Подразделение с таким именем уже существует."
+
+#: plugins/gofon/macro/class_gofonMacro.inc:328
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:141
+#: plugins/gofon/macro/class_gofonMacro.inc:332
+msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:337
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:150
+#: plugins/gofon/macro/class_gofonMacro.inc:343
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
+#: plugins/gofon/macro/class_gofonMacro.inc:348
+#, fuzzy
+msgid "Please choose a valid  base."
+msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
+
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 #, fuzzy
 msgid "Macro name"
@@ -5935,6 +6388,11 @@ msgstr "Название"
 msgid "Macro name to be displayed"
 msgstr ""
 
+#: plugins/gofon/macro/generic.tpl:22
+#, fuzzy
+msgid "Choose subtree to place macro in"
+msgstr "Выберите ветку для группы"
+
 #: plugins/gofon/macro/generic.tpl:43
 #, fuzzy
 msgid "Visible for user"
@@ -5950,7 +6408,7 @@ msgstr "Название"
 msgid "List of macros"
 msgstr "Список групп"
 
-#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/macro/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit and remove selected macros. You may want "
@@ -5961,27 +6419,12 @@ msgstr ""
 "группы пользователей. Если у вас их достаточно большое количество, вы можете "
 "использовать групповое выделение."
 
-#: plugins/gofon/macro/headpage.tpl:32
-#, fuzzy
-msgid ""
-"-Edit- and -New...- will execute an assistant to aid you in editing "
-"properties. -Delete- will ask for confirmation before removing macros."
-msgstr ""
-"При изменении и создании приложений появится интерактивный помощник для "
-"редактирования свойств. Перед удалением приложений вам нужно будет "
-"подтвердить свое решение."
-
-#: plugins/gofon/macro/headpage.tpl:46
-#, fuzzy
-msgid "Display macros of department"
-msgstr "Объединения в подразделении"
-
-#: plugins/gofon/macro/headpage.tpl:59
+#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
 msgid "Display macros  matching"
 msgstr "Шаблон для групп"
 
-#: plugins/gofon/macro/headpage.tpl:62
+#: plugins/gofon/macro/headpage.tpl:44
 #, fuzzy
 msgid "Regular expression for matching macro names"
 msgstr "Регулярное выражение, соответствующее именам групп"
@@ -5991,30 +6434,30 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Phone macro management"
 msgstr "Управление системами"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:200
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:233
 #, fuzzy
 msgid "String"
 msgstr "в течение"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:201
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:234
 msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:202
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:235
 msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:208
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
 #, fuzzy
 msgid "Delete unused"
 msgstr "Удалить"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:269
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:315
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:282
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
@@ -6024,16 +6467,46 @@ msgstr ""
 msgid "Phone macros"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:186
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
 #, fuzzy, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:192
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
 #, fuzzy
 msgid "You are not allowed to delete this macro!"
 msgstr "У вас недостаточно прав для удаления этой группы!"
 
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "Переменная"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:365
+#, fuzzy
+msgid "Macro"
+msgstr "Название"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:366
+#, fuzzy
+msgid "visible"
+msgstr "Видимый всем"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:367
+#, fuzzy
+msgid "invisible"
+msgstr "Видимый всем"
+
 #: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
 msgid "Argument"
@@ -6044,22 +6517,10 @@ msgstr "подразделения"
 msgid "type"
 msgstr "Тип"
 
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Группа"
-
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Тонкий клиент"
 
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Рабочая станция"
-
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Объект группы"
-
 #: plugins/generic/references/contents.tpl:11
 msgid "Object name"
 msgstr "Имя объекта"
@@ -6101,54 +6562,54 @@ msgstr "Команда разработчиков GOsa"
 msgid "Welcome %s!"
 msgstr "Добро пожаловать %s!"
 
-#: include/php_setup.inc:61
+#: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:61 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:292
 #, fuzzy
 msgid "Toggle information"
 msgstr "Личная информация"
 
-#: include/php_setup.inc:66
+#: include/php_setup.inc:76
 #, fuzzy
 msgid "PHP error"
 msgstr "Ошибка LDAP:"
 
-#: include/php_setup.inc:77
+#: include/php_setup.inc:87
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:83
+#: include/php_setup.inc:93
 #, fuzzy
 msgid "function"
 msgstr "Действие"
 
-#: include/php_setup.inc:88
+#: include/php_setup.inc:98
 #, fuzzy
 msgid "static"
 msgstr "Состояние"
 
-#: include/php_setup.inc:92
+#: include/php_setup.inc:102
 #, fuzzy
 msgid "method"
 msgstr "Почтовые настройки"
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:121
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:112
+#: include/php_setup.inc:122
 #, fuzzy
 msgid "File"
 msgstr "Файлы"
 
-#: include/php_setup.inc:112
+#: include/php_setup.inc:122
 #, fuzzy
 msgid "Line"
 msgstr "в"
 
-#: include/php_setup.inc:113
+#: include/php_setup.inc:123
 #, fuzzy
 msgid "Arguments"
 msgstr "подразделения"
@@ -6163,18 +6624,18 @@ msgstr "Ошибка при подключении к LDAP-серверу. От
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:313
+#: include/functions.inc:312
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:351
+#: include/functions.inc:350
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr "Ошибка при создании блокировки. Заданные параметры некорректны."
 
-#: include/functions.inc:361
+#: include/functions.inc:360
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -6183,24 +6644,24 @@ msgstr ""
 "Не удается создать блокировку в базе данных LDAP. Проверьте, раздел config в "
 "файле gosa.conf! Ответ сервера: %s"
 
-#: include/functions.inc:376
+#: include/functions.inc:375
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr "Ошибка при создании блокировки. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:402
+#: include/functions.inc:401
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr "Ошибка при удалении блокировки. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:432
+#: include/functions.inc:431
 #, fuzzy
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr "Ошибка при чтении блокировки. Заданные параметры некорректны."
 
-#: include/functions.inc:442
+#: include/functions.inc:441
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -6208,7 +6669,7 @@ msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
 "\" в файле gosa.conf!"
 
-#: include/functions.inc:450
+#: include/functions.inc:449
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -6216,12 +6677,12 @@ msgstr ""
 "Для блокируемого объекта обнаружено несколько блокировок. Этого быть не "
 "должно, проверьте работу LDAP."
 
-#: include/functions.inc:522
+#: include/functions.inc:563
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:524
+#: include/functions.inc:565
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -6230,15 +6691,15 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:536
+#: include/functions.inc:577
 msgid "Configure"
 msgstr "Настроить"
 
-#: include/functions.inc:541
+#: include/functions.inc:582
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:924
+#: include/functions.inc:981
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -6247,15 +6708,15 @@ msgstr ""
 "Вы собираетесь редактировать запись LDAP \"%s\", которая используется \"%s"
 "\". Пожалуйста, обратитесь к пользователю и уточните отношения."
 
-#: include/functions.inc:1023
+#: include/functions.inc:1080
 msgid "LDAP error:"
 msgstr "Ошибка LDAP:"
 
-#: include/functions.inc:1469
+#: include/functions.inc:1534
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:1512
+#: include/functions.inc:1577
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -6347,21 +6808,21 @@ msgstr "Для этого DN нет расширений учетной запи
 msgid "This is an empty plugin."
 msgstr "Это пустой модуль."
 
-#: include/class_plugin.inc:386
+#: include/class_plugin.inc:396
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:412 include/class_password-methods.inc:178
+#: include/class_plugin.inc:422 include/class_password-methods.inc:181
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: include/class_plugin.inc:438
+#: include/class_plugin.inc:448
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -6379,7 +6840,7 @@ msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: include/class_config.inc:426
+#: include/class_config.inc:431
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
 
@@ -6387,12 +6848,12 @@ msgstr "В вашем файле настройки отсутствуют зн
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_password-methods.inc:162
+#: include/class_password-methods.inc:165
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "Ошибка при установке пароля. Ответ LDAP-сервера: \"%s\"."
 
-#: include/class_password-methods.inc:199
+#: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
@@ -6418,7 +6879,7 @@ msgstr "Ошибка смены пароля в базе данных Kerberos!"
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
 
-#: include/class_ldap.inc:398
+#: include/class_ldap.inc:438
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -6427,19 +6888,19 @@ msgstr ""
 "Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
 "об этом команде разработчиков GOsa."
 
-#: include/class_ldap.inc:631
+#: include/class_ldap.inc:671
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:644
+#: include/class_ldap.inc:684
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:660
+#: include/class_ldap.inc:700
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -6574,38 +7035,38 @@ msgstr "Поддержка Gofon отключена, не все схемы ус
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/functions_setup.inc:233
+#: include/functions_setup.inc:236
 #, fuzzy
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr "Поддержка Gofon отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:243
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:258
+#: include/functions_setup.inc:261
 msgid "OK"
 msgstr "OK"
 
-#: include/functions_setup.inc:261
+#: include/functions_setup.inc:264
 msgid "Ignored"
 msgstr "Пропуск"
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:266
 msgid "Failed"
 msgstr "Ошибка"
 
-#: include/functions_setup.inc:280
+#: include/functions_setup.inc:283
 msgid "PHP setup inspection"
 msgstr "Проверка конфигурации PHP"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:284
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Проверка версии PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:282
+#: include/functions_setup.inc:285
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -6613,11 +7074,11 @@ msgstr ""
 "У вас должна быть установка PHP версии не ниже 4.1.0, так как в ней "
 "реализованы некоторые новые функции и исправлены некоторые ошибки."
 
-#: include/functions_setup.inc:285
+#: include/functions_setup.inc:288
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Проверка значения параметра register_globals (должно быть: off)"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:289
 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 "
@@ -6627,47 +7088,47 @@ msgstr ""
 "переменные доступными из сценария без смены области действия. Это может быть "
 "нарушением безопасности. Тем не менее, GOsa будет работать в любом случае."
 
-#: include/functions_setup.inc:289
+#: include/functions_setup.inc:292
 msgid "Checking for ldap module"
 msgstr "Проверка модуля ldap"
 
-#: include/functions_setup.inc:290
+#: include/functions_setup.inc:293
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Основной модуль, используемый GOsa, и поэтому обязательный."
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:296
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:294
+#: include/functions_setup.inc:297
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:297
+#: include/functions_setup.inc:300
 msgid "Checking for gettext support"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:301
 msgid "Gettext support is required for internationalized GOsa."
 msgstr "Необходима для локализованных версий GOsa."
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:303
 #, fuzzy
 msgid "Checking for iconv support"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:301
+#: include/functions_setup.inc:304
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:307
 msgid "Checking for mhash module"
 msgstr "Проверка модуля mhash"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:308
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
@@ -6676,11 +7137,11 @@ msgstr ""
 "используете только алгоритмы crypt или MD5, не обращайте внимания на "
 "результат проверки. GOsa будет работать и без этого модуля."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:311
 msgid "Checking for imap module"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:312
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -6688,11 +7149,11 @@ msgstr ""
 "Этот модуль нужен для работы с сервером IMAP. С его помощью можно получать "
 "информацию о состоянии учетной записи, создавать и удалять пользователей."
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:315
 msgid "Checking for getacl in imap"
 msgstr "Проверка использования getacl в IMAP"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:316
 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 "
@@ -6702,21 +7163,21 @@ msgstr ""
 "Стандартный модуль IMAP не может обрабатывать acl. Для использования этой "
 "функции вам нужна последняя версия PHP."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:319
 msgid "Checking for mysql module"
 msgstr "Проверка модуля mysql"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:320
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Необходим для чтения отчетов о полученных факсимильных сообщениях из базы "
 "данных."
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:323
 msgid "Checking for cups module"
 msgstr "Проверка модуля cups"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:324
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -6724,11 +7185,11 @@ msgstr ""
 "Чтобы получать информацию о доступных принтерах по протоколу IPP вместо "
 "чтения файлов printcap, вам нужно установить модуль CUPS."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:327
 msgid "Checking for kadm5 module"
 msgstr "Проверка модуля kadm5"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:328
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -6736,25 +7197,25 @@ msgstr ""
 "Чтобы управлять пользователями с помощью Kerberos, необходим модуль kadm5, "
 "который можно загрузить из сети PEAR."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:331
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:332
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:338
+#: include/functions_setup.inc:342
 msgid "Checking for some additional programms"
 msgstr "Проверка дополнительных программ"
 
-#: include/functions_setup.inc:347
+#: include/functions_setup.inc:351
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Проверка ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:352
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -6762,12 +7223,12 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/functions_setup.inc:351
+#: include/functions_setup.inc:355
 #, fuzzy
 msgid "Checking imagick module for PHP"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:356
 #, fuzzy
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
@@ -6776,11 +7237,11 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/functions_setup.inc:359
+#: include/functions_setup.inc:363
 msgid "Checking for fping utility"
 msgstr "Проверка утилиты fping"
 
-#: include/functions_setup.inc:360
+#: include/functions_setup.inc:364
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -6788,11 +7249,11 @@ msgstr ""
 "Эта программа используется, только если вы работате с бездисковыми "
 "терминалами."
 
-#: include/functions_setup.inc:375
+#: include/functions_setup.inc:379
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Проверка возможности создания хэшей LM/NT для паролей"
 
-#: include/functions_setup.inc:376
+#: include/functions_setup.inc:380
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -6800,71 +7261,71 @@ msgstr ""
 "Чтобы пользоваться Samba 2/3, вам нужно установить некоторые дополнительные "
 "программы для создания хэшей паролей."
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:393
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:390
+#: include/functions_setup.inc:394
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:397
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:398
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:401
+#: include/functions_setup.inc:405
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:402
+#: include/functions_setup.inc:406
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:409
+#: include/functions_setup.inc:413
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:410
+#: include/functions_setup.inc:414
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:418
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:419
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:423
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:420
+#: include/functions_setup.inc:424
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:658
+#: include/functions_setup.inc:666
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Для продолжения укажите LDAP-сервер!"
 
-#: include/functions_setup.inc:667 include/functions_setup.inc:749
+#: include/functions_setup.inc:675 include/functions_setup.inc:758
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -6872,8 +7333,8 @@ msgstr ""
 "Не удается подключиться к указанному LDAP-серверу! Убедитесь, что он "
 "доступен GOsa."
 
-#: include/functions_setup.inc:681 include/functions_setup.inc:754
-#: include/functions_setup.inc:759
+#: include/functions_setup.inc:689 include/functions_setup.inc:763
+#: include/functions_setup.inc:768
 #, fuzzy
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
@@ -6882,13 +7343,13 @@ msgstr ""
 "Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
 "доступен GOsa."
 
-#: include/functions_setup.inc:769
+#: include/functions_setup.inc:778
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
 msgstr ""
 
-#: include/functions_setup.inc:825
+#: include/functions_setup.inc:834
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -6897,19 +7358,19 @@ msgstr ""
 "Вы не заполнили обязательное поле \"%s\". Пожалуйста, заполните форму "
 "целиком."
 
-#: include/functions_setup.inc:856
+#: include/functions_setup.inc:865
 msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Pleasy "
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:865
+#: include/functions_setup.inc:874
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
 
-#: include/functions_setup.inc:975 include/functions_setup.inc:998
-#: include/functions_setup.inc:1007 html/index.php:176
+#: include/functions_setup.inc:984 include/functions_setup.inc:1007
+#: include/functions_setup.inc:1016 html/index.php:176
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -7093,13 +7554,6 @@ msgstr ""
 "Чтобы войти в систему<br> введите свои <i>имя пользователя</i> и <i>пароль</"
 "i>."
 
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
-msgid "Username"
-msgstr "Имя пользователя"
-
 #: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
 #: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
 msgid "Directory"
@@ -7327,8 +7781,33 @@ msgstr ""
 msgid "Mail method"
 msgstr "Почтовые настройки"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:100
-#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/altlinux/setup_step4.tpl:99
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting. "
+"(But it  could be a security risk)  "
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:103
+#: ihtml/themes/default/setup_step4.tpl:104
+#, fuzzy
+msgid "Display PHP errors"
+msgstr "Ошибка LDAP:"
+
+#: ihtml/themes/altlinux/setup_step4.tpl:106
+#: ihtml/themes/default/setup_step4.tpl:107
+#, fuzzy
+msgid "true"
+msgstr "Улица"
+
+#: ihtml/themes/altlinux/setup_step4.tpl:107
+#: ihtml/themes/default/setup_step4.tpl:108
+#, fuzzy
+msgid "false"
+msgstr "женский"
+
+#: ihtml/themes/altlinux/setup_step4.tpl:115
+#: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr "Проверить"
 
@@ -7397,20 +7876,107 @@ msgstr ""
 msgid "Index"
 msgstr ""
 
+#: ihtml/themes/default/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting. "
+"(But it could be a security risk)  "
+msgstr ""
+
 #, fuzzy
-#~ msgid "Telefon PIN"
-#~ msgstr "Телефон"
+#~ msgid ""
+#~ "-Edit- and -New...- will execute an assistant to aid you when performing "
+#~ "changes on your blocklist. -Delete- will ask you for confirmation before "
+#~ "really deleting anything."
+#~ msgstr ""
+#~ "При изменении и создании стоп-листов появится интерактивный помощник для "
+#~ "редактирования их свойств. Перед удалением списка вам нужно будет "
+#~ "подтвердить свое решение."
 
-#~ msgid "Show empty groups"
-#~ msgstr "Ð\9fоказаÑ\82Ñ\8c пÑ\83Ñ\81Ñ\82Ñ\8bе гÑ\80Ñ\83ппÑ\8b"
+#~ msgid "Display lists of department"
+#~ msgstr "СÑ\82оп-лиÑ\81Ñ\82Ñ\8b в подÑ\80азделении"
 
 #, fuzzy
-#~ msgid "false"
-#~ msgstr "женский"
+#~ msgid ""
+#~ "-Edit- and -New...- will execute an assistant to aid you in editing group "
+#~ "properties. -Delete- will ask for confirmation before removing groups."
+#~ msgstr ""
+#~ "При изменении и создании групп появится интерактивный помощник для "
+#~ "редактирования их свойств. Перед удалением групп вам нужно будет "
+#~ "подтвердить свое решение."
+
+#~ msgid "Dive into LDAP subtrees when searching"
+#~ msgstr "Искать в поддеревьях LDAP"
+
+#~ msgid "Search in subtrees"
+#~ msgstr "Искать в поддеревьях"
 
 #, fuzzy
-#~ msgid "true"
-#~ msgstr "Улица"
+#~ msgid ""
+#~ "-Edit- and -New...- execute an assistant to aid you in managing your "
+#~ "account informations. -Delete- will ask for confirmation before deleting "
+#~ "users."
+#~ msgstr ""
+#~ "При изменении и создании пользователей появится интерактивный помощник "
+#~ "для редактирования их учетных записей. Перед удалением пользователей с "
+#~ "сервера LDAP вам нужно будет подтвердить свое решение."
+
+#, fuzzy
+#~ msgid ""
+#~ "-Edit- and -New...- will execute an assistant to aid you in editing "
+#~ "properties. -Delete- will ask for confirmation before removing "
+#~ "applications."
+#~ msgstr ""
+#~ "При изменении и создании приложений появится интерактивный помощник для "
+#~ "редактирования свойств. Перед удалением приложений вам нужно будет "
+#~ "подтвердить свое решение."
+
+#~ msgid "Display applications of department"
+#~ msgstr "Приложения в подразделении"
+
+#, fuzzy
+#~ msgid ""
+#~ "-Edit- and -New...- will provide an assistant to aid you when performing "
+#~ "changes on your departments. -Delete- will ask for confirmation before "
+#~ "deleting departments."
+#~ msgstr ""
+#~ "При изменении и создании подразделения появится интерактивный помощник "
+#~ "для редактирования информации об этом подразделении. Перед удалением "
+#~ "подразделения вам нужно будет подтвердить свое решение."
+
+#~ msgid "Display subdepartments of"
+#~ msgstr "Подразделения в подразделении"
+
+#~ msgid "Thin client template for"
+#~ msgstr "Шаблон тонкого клиента для"
+
+#, fuzzy
+#~ msgid ""
+#~ "-Edit- will execute an assistant to aid you in changing the system "
+#~ "properties. -Delete- will ask for confirmation before deleting systems."
+#~ msgstr ""
+#~ "-Edit- запустит помошника который поможет Вам изменить настройки системы. "
+#~ "-Delete- спросит вас прежде чем действительно удалить объект из каталога."
+
+#, fuzzy
+#~ msgid ""
+#~ "-Edit- and -New...- will execute an assistant to aid you in editing "
+#~ "properties. -Delete- will ask for confirmation before removing macros."
+#~ msgstr ""
+#~ "При изменении и создании приложений появится интерактивный помощник для "
+#~ "редактирования свойств. Перед удалением приложений вам нужно будет "
+#~ "подтвердить свое решение."
+
+#, fuzzy
+#~ msgid "Display macros of department"
+#~ msgstr "Объединения в подразделении"
+
+#, fuzzy
+#~ msgid "Telefon PIN"
+#~ msgstr "Телефон"
+
+#~ msgid "Show empty groups"
+#~ msgstr "Показать пустые группы"
 
 #, fuzzy
 #~ msgid "The given value for goFonQualify is not a valid number."