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 fd3155101a36e38272c38109915848e60cc4c2c1..2779ce819ebd6a884036e2becc2dcffe130e6097 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -22,16 +22,17 @@ msgstr "Моя учетная запись"
 msgid "Administration"
 msgstr "Администрирование"
 
-#: contrib/gosa.conf:40
+#: contrib/gosa.conf:42
 msgid "Addons"
 msgstr "Дополнительно"
 
-#: contrib/gosa.conf:55 contrib/gosa.conf:66 contrib/gosa.conf:74
-#: contrib/gosa.conf:80 contrib/gosa.conf:88 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:115
-#: contrib/gosa.conf:120 contrib/gosa.conf:125 contrib/gosa.conf:130
-#: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: contrib/gosa.conf:57 contrib/gosa.conf:68 contrib/gosa.conf:76
+#: contrib/gosa.conf:82 contrib/gosa.conf:88 contrib/gosa.conf:96
+#: contrib/gosa.conf:105 contrib/gosa.conf:113 contrib/gosa.conf:118
+#: contrib/gosa.conf:123 contrib/gosa.conf:128 contrib/gosa.conf:133
+#: contrib/gosa.conf:138 plugins/personal/mail/generic.tpl:4
+#: plugins/personal/posix/generic.tpl:4 plugins/personal/samba/samba2.tpl:6
+#: plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
@@ -39,138 +40,155 @@ msgstr "Дополнительно"
 msgid "Generic"
 msgstr "Общее"
 
-#: contrib/gosa.conf:56
+#: contrib/gosa.conf:58
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:57 contrib/gosa.conf:68
+#: 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:58 plugins/personal/samba/class_sambaAccount.inc:24
+#: 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"
 msgstr "Samba"
 
-#: contrib/gosa.conf:59 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:61 plugins/personal/connectivity/main.inc:136
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Подключение"
 
-#: contrib/gosa.conf:60 plugins/personal/generic/generic.tpl:231
+#: contrib/gosa.conf:62 plugins/personal/generic/generic.tpl:231
 #: 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 "Факс"
 
-#: contrib/gosa.conf:61 plugins/personal/generic/generic.tpl:214
+#: 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"
 msgstr "Телефон"
 
-#: contrib/gosa.conf:62 contrib/gosa.conf:70 contrib/gosa.conf:76
-#: contrib/gosa.conf:84 contrib/gosa.conf:93 contrib/gosa.conf:101
-#: contrib/gosa.conf:106 contrib/gosa.conf:111 contrib/gosa.conf:116
-#: contrib/gosa.conf:121 contrib/gosa.conf:126 contrib/gosa.conf:131
+#: contrib/gosa.conf:64 contrib/gosa.conf:72 contrib/gosa.conf:78
+#: contrib/gosa.conf:84 contrib/gosa.conf:92 contrib/gosa.conf:101
+#: contrib/gosa.conf:109 contrib/gosa.conf:114 contrib/gosa.conf:119
+#: contrib/gosa.conf:124 contrib/gosa.conf:129 contrib/gosa.conf:134
+#: contrib/gosa.conf:139
 msgid "References"
 msgstr "Ссылки"
 
-#: contrib/gosa.conf:67
+#: contrib/gosa.conf:69
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr "Приложения"
 
-#: contrib/gosa.conf:69
+#: contrib/gosa.conf:71
 msgid "ACL"
 msgstr "Доступ"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Options"
 msgstr "Параметры"
 
-#: contrib/gosa.conf:81 contrib/gosa.conf:98
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:482
+#, fuzzy
+msgid "Parameter"
+msgstr "Параметры загрузки"
+
+#: contrib/gosa.conf:89 contrib/gosa.conf:106
 msgid "Devices"
 msgstr "Устройства"
 
-#: contrib/gosa.conf:82 contrib/gosa.conf:99
+#: contrib/gosa.conf:90 contrib/gosa.conf:107
 msgid "Startup"
 msgstr "Запуск"
 
-#: contrib/gosa.conf:83 contrib/gosa.conf:92 contrib/gosa.conf:100
+#: contrib/gosa.conf:91 contrib/gosa.conf:100 contrib/gosa.conf:108
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:97
 msgid "Databases"
 msgstr "Базы данных"
 
-#: contrib/gosa.conf:90 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:98 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Сервисы"
 
-#: contrib/gosa.conf:143 plugins/addons/ldapmanager/contentexport.tpl:19
-#: plugins/addons/ldapmanager/contentexport.tpl:32
-#: plugins/addons/ldapmanager/contentexport.tpl:47
+#: 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:144 plugins/personal/mail/generic.tpl:107
-#: plugins/addons/ldapmanager/contentimport.tpl:56
-#: plugins/addons/ldapmanager/contentcsv.tpl:119
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: 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:145
+#: contrib/gosa.conf:153
 #, fuzzy
 msgid "CSV Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:160
+#: contrib/gosa.conf:169
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:186
 msgid "German"
 msgstr "Немецкий"
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:187
 msgid "Russian"
 msgstr "Русский"
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:188
 msgid "Spanish"
 msgstr "Испанский"
 
-#: contrib/gosa.conf:180
+#: contrib/gosa.conf:189
 msgid "French"
 msgstr "Французский"
 
-#: contrib/gosa.conf:181
+#: contrib/gosa.conf:190
 msgid "Dutch"
 msgstr "Датский"
 
-#: contrib/gosa.conf:182
+#: contrib/gosa.conf:191
 msgid "English"
 msgstr "Английский"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:192
 msgid "Italian"
 msgstr ""
 
@@ -183,9 +201,10 @@ msgstr ""
 #: plugins/personal/connectivity/class_phpgwAccount.inc:6
 #: plugins/personal/connectivity/class_kolabAccount.inc:6
 #: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:6
+#: 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
@@ -203,6 +222,7 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
 #: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 msgid "This does something"
 msgstr "Что-то будет"
 
@@ -216,16 +236,17 @@ msgstr "Метод '%s' не описан в вашем файле конфиг
 msgid "No DESC tag in vacation file:"
 msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
 
-#: plugins/personal/mail/class_mailAccount.inc:189
+#: plugins/personal/mail/class_mailAccount.inc:200
 msgid "This account has no mail extensions."
 msgstr "В этой учетной записи нет почтовых расширений."
 
-#: plugins/personal/mail/class_mailAccount.inc:197
+#: plugins/personal/mail/class_mailAccount.inc:209
 #: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
 msgid "Remove mail account"
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/mail/class_mailAccount.inc:198
+#: plugins/personal/mail/class_mailAccount.inc:210
 #: plugins/admin/groups/class_groupMail.inc:188
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -234,12 +255,13 @@ msgstr ""
 "В этой учетной записи есть настройки электронной почты. Вы можете удалить "
 "их, щелкнув ниже."
 
-#: plugins/personal/mail/class_mailAccount.inc:200
+#: plugins/personal/mail/class_mailAccount.inc:212
 #: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Create mail account"
 msgstr "Создать настройки запись эл. почты"
 
-#: plugins/personal/mail/class_mailAccount.inc:201
+#: plugins/personal/mail/class_mailAccount.inc:212
 #: plugins/admin/groups/class_groupMail.inc:191
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -248,21 +270,21 @@ msgstr ""
 "В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
 "щелкнув ниже."
 
-#: plugins/personal/mail/class_mailAccount.inc:249
+#: plugins/personal/mail/class_mailAccount.inc:260
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
 "кому должны пересылаться сообщения."
 
-#: plugins/personal/mail/class_mailAccount.inc:255
+#: plugins/personal/mail/class_mailAccount.inc:266
 #: plugins/admin/groups/class_groupMail.inc:250
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Добавление своего единственного адреса к списку пересылки не имеет смысла."
 
-#: plugins/personal/mail/class_mailAccount.inc:290
-#: plugins/personal/mail/class_mailAccount.inc:295
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -271,47 +293,61 @@ msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку "
 "альтернативных адресов."
 
-#: plugins/personal/mail/class_mailAccount.inc:305
+#: plugins/personal/mail/class_mailAccount.inc:316
 #: plugins/admin/groups/class_groupMail.inc:283
 msgid "The address you're trying to add is already used by user"
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: plugins/personal/mail/class_mailAccount.inc:668
+#: 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:694
 #: plugins/admin/groups/class_groupMail.inc:610
 msgid "The required field 'Primary address' is not set."
 msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/personal/mail/class_mailAccount.inc:672
-#: plugins/personal/mail/class_mailAccount.inc:676
-#: plugins/addons/addressbook/class_addressbook.inc:551
+#: 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:683
+#: 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:689
+#: 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:698
+#: 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:708
+#: 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 "Сервер"
@@ -320,223 +356,226 @@ msgstr "Сервер"
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Выберите почтовый сервер для учетной записи пользователя"
 
-#: plugins/personal/mail/generic.tpl:21 plugins/admin/groups/mail.tpl:24
+#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr "Использование квоты"
 
-#: plugins/personal/mail/generic.tpl:28 plugins/admin/groups/mail.tpl:31
-#: plugins/admin/systems/class_terminalInfo.inc:136
+#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:147
 msgid "not defined"
 msgstr "не определена"
 
-#: plugins/personal/mail/generic.tpl:33 plugins/admin/groups/mail.tpl:36
+#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
 msgid "Quota size"
 msgstr "Размер квоты"
 
-#: plugins/personal/mail/generic.tpl:47 plugins/admin/groups/mail.tpl:46
+#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
 #, fuzzy
 msgid "Alternative addresses"
 msgstr "Альтернативные адреса"
 
-#: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:47
+#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:175
+#: plugins/admin/systems/phonesettings.tpl:190
 msgid "List of alternative mail addresses"
 msgstr "Список альтернативных адресов эл. почты"
 
-#: plugins/personal/mail/generic.tpl:55 plugins/personal/mail/generic.tpl:121
-#: plugins/personal/mail/mail_locals.tpl:49
-#: plugins/personal/posix/trust_machines.tpl:45
-#: plugins/personal/posix/posix_groups.tpl:56
-#: plugins/personal/posix/generic.tpl:63
-#: plugins/personal/posix/generic.tpl:122
+#: 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
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
-#: plugins/personal/samba/samba3_workstations.tpl:45
-#: plugins/personal/connectivity/class_kolabAccount.inc:195
-#: plugins/personal/connectivity/kolab.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:60
-#: plugins/gofax/faxaccount/generic.tpl:73
-#: plugins/gofax/faxaccount/locals.tpl:48
-#: plugins/gofax/faxaccount/lists.tpl:11 plugins/gofax/faxaccount/lists.tpl:15
-#: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
+#: plugins/personal/samba/samba3_workstations.tpl:39
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: 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:45
-#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/mail_locals.tpl:49
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:45
-#: plugins/admin/systems/startup.tpl:59 plugins/admin/systems/startup.tpl:72
-#: plugins/admin/systems/startup.tpl:91
-#: plugins/admin/ogroups/ogroup_objects.tpl:56
+#: 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
+#: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: 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:207
-#: plugins/gofon/phoneaccount/generic.tpl:45
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:633
+#: plugins/gofon/phoneaccount/generic.tpl:11
 msgid "Add"
 msgstr "Добавить"
 
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:125
-#: plugins/personal/posix/generic.tpl:64
-#: plugins/personal/posix/generic.tpl:124
+#: 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:19
-#: plugins/gofax/blocklists/generic.tpl:61
+#: plugins/personal/connectivity/kolab.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
-#: plugins/gofax/blocklists/headpage.tpl:17
-#: plugins/gofax/faxaccount/generic.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:12
-#: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:53
-#: plugins/admin/groups/mail.tpl:99 plugins/admin/groups/headpage.tpl:17
-#: plugins/admin/groups/remove.tpl:15 plugins/admin/groups/generic.tpl:89
-#: plugins/admin/users/remove.tpl:15 plugins/admin/users/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/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:17
 #: plugins/admin/departments/remove.tpl:15
-#: plugins/admin/departments/headpage.tpl:17
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/servservice.tpl:46
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
-#: plugins/admin/systems/startup.tpl:60 plugins/admin/systems/startup.tpl:73
-#: plugins/admin/systems/startup.tpl:92 plugins/admin/ogroups/generic.tpl:39
-#: plugins/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/headpage.tpl:17
-#: plugins/gofon/phoneaccount/generic.tpl:47
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: 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/gofon/phoneaccount/generic.tpl:13 plugins/gofon/macro/remove.tpl:14
 msgid "Delete"
 msgstr "Удалить"
 
-#: plugins/personal/mail/generic.tpl:65
+#: plugins/personal/mail/generic.tpl:66
 msgid "Mail options"
 msgstr "Почтовые настройки"
 
-#: plugins/personal/mail/generic.tpl:70
+#: plugins/personal/mail/generic.tpl:71
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "Выберите, нужно ли оставлять копии перенаправляемых сообщений"
 
-#: plugins/personal/mail/generic.tpl:70
+#: plugins/personal/mail/generic.tpl:71
 msgid "No delivery to own mailbox"
 msgstr "Не оставлять копии в своем почтовом ящике"
 
-#: plugins/personal/mail/generic.tpl:73
+#: plugins/personal/mail/generic.tpl:74
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Выберите, чтобы включить автоответчик с сообщением, указанным ниже"
 
-#: plugins/personal/mail/generic.tpl:73
+#: plugins/personal/mail/generic.tpl:74
 msgid "Activate vacation message"
 msgstr "Включить автоответчик"
 
-#: plugins/personal/mail/generic.tpl:80
+#: plugins/personal/mail/generic.tpl:81
 #, fuzzy
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Выберите, нужно ли фильтровать сообщения с помощью SpamAssassin"
 
-#: plugins/personal/mail/generic.tpl:80
+#: plugins/personal/mail/generic.tpl:81
 msgid "Move mails tagged with spam level greater than"
 msgstr "Перемещать сообщения с меткой рекламы больше"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:83
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Выберите метку рекламы - чем меньше значение, тем чувствительнее фильтр"
 
-#: plugins/personal/mail/generic.tpl:84
+#: plugins/personal/mail/generic.tpl:86
 msgid "to folder"
 msgstr "в папку"
 
-#: plugins/personal/mail/generic.tpl:90
+#: plugins/personal/mail/generic.tpl:93
 msgid "Reject mails bigger than"
 msgstr "Отклонять сообщения размером больше"
 
-#: plugins/personal/mail/generic.tpl:92
+#: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "MB"
 msgstr "Мб"
 
-#: plugins/personal/mail/generic.tpl:98
+#: plugins/personal/mail/generic.tpl:101
 msgid "Vacation message"
 msgstr "Сообщение автоответчика"
 
-#: plugins/personal/mail/generic.tpl:113
+#: plugins/personal/mail/generic.tpl:118
 msgid "Forward messages to"
 msgstr "Перенаправлять сообщения"
 
-#: plugins/personal/mail/generic.tpl:123
-#: plugins/gofax/faxaccount/generic.tpl:74 plugins/admin/groups/mail.tpl:98
+#: 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:133
+#: plugins/personal/mail/generic.tpl:139
 msgid "Advanced mail options"
 msgstr "Дополнительные почтовые настройки"
 
-#: plugins/personal/mail/generic.tpl:138
+#: 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:139
+#: plugins/personal/mail/generic.tpl:145
 msgid "User is only allowed to send and receive local mails"
 msgstr "Пользователь может отправлять и получать почту только локально"
 
-#: plugins/personal/mail/generic.tpl:146
+#: plugins/personal/mail/generic.tpl:152
 msgid "Use custom sieve script"
 msgstr "Использовать другой сценарий SIEVE"
 
-#: plugins/personal/mail/generic.tpl:146
+#: plugins/personal/mail/generic.tpl:152
 msgid "disables all Mail options!"
 msgstr "отключает все почтовые настройки!"
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:60
+#: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
 #: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:74
+#: plugins/gofax/blocklists/generic.tpl:77
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:257
-#: plugins/admin/users/class_userManagement.inc:503
-#: plugins/admin/applications/class_applicationManagement.inc:239
-#: plugins/admin/departments/class_departmentManagement.inc:228
-#: plugins/admin/systems/class_systemManagement.inc:438
-#: plugins/admin/ogroups/class_ogroupManagement.inc:274
+#: 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:300
 msgid "Finish"
 msgstr "Готово"
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:51
-#: plugins/personal/posix/trust_machines.tpl:47
-#: plugins/personal/posix/posix_groups.tpl:58
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:74
 #: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
-#: plugins/personal/samba/samba3_workstations.tpl:47
+#: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:62
+#: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:76
+#: plugins/gofax/blocklists/generic.tpl:79
 #: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:50
-#: plugins/gofax/faxaccount/lists.tpl:37 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:11
-#: plugins/addons/addressbook/address_edit.tpl:108
+#: 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:115
 #: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: 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:47
+#: plugins/admin/groups/group_objects.tpl:51
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:51 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/template.tpl:48
-#: plugins/admin/users/class_userManagement.inc:505
+#: 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: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:440
+#: 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:58
-#: plugins/admin/ogroups/class_ogroupManagement.inc:276
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
 #: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/classic/islocked.tpl:15
-#: ihtml/themes/default/islocked.tpl:15
+#: plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -551,14 +590,9 @@ 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:16
-#: plugins/gofax/faxaccount/generic.tpl:88
-#: plugins/gofax/faxaccount/generic.tpl:94
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:60
-#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:17
-#: plugins/admin/applications/headpage.tpl:16
-#: plugins/admin/departments/headpage.tpl:16
-#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:16
+#: 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/gofon/phoneaccount/main.inc:112
 msgid "Edit"
 msgstr "Изменить"
@@ -572,64 +606,77 @@ msgstr "Почтовые настройки пользователя"
 msgid "Select addresses to add"
 msgstr "Выберите адреса для добавления"
 
-#: plugins/personal/mail/mail_locals.tpl:29
-#: plugins/admin/groups/mail_locals.tpl:29
+#: 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:32
 msgid "Display addresses of department"
 msgstr "Показать адреса подразделения"
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/personal/posix/posix_groups.tpl:37
-#: plugins/personal/samba/samba3_workstations.tpl:30
-#: plugins/gofax/blocklists/headpage.tpl:50
-#: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:72
-#: plugins/admin/groups/headpage.tpl:57
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:30 plugins/admin/users/headpage.tpl:61
-#: plugins/admin/applications/headpage.tpl:46
-#: plugins/admin/departments/headpage.tpl:46
-#: plugins/admin/systems/headpage.tpl:56
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/ogroups/headpage.tpl:58
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: 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
 msgid "Choose the department the search will be based on"
 msgstr "Выбрать раздел, для которого будет осуществлен поиск"
 
-#: plugins/personal/mail/mail_locals.tpl:35
-#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
 msgid "Display addresses matching"
 msgstr "Показать подходяшие адреса"
 
-#: plugins/personal/mail/mail_locals.tpl:36
-#: plugins/personal/posix/trust_machines.tpl:36
-#: plugins/personal/samba/samba3_workstations.tpl:36
-#: plugins/admin/groups/mail_locals.tpl:36
+#: 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:47
 msgid "Regular expression for matching addresses"
 msgstr "Регулярное выражение для поиска адреса"
 
-#: plugins/personal/mail/mail_locals.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:39
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
 msgid "Display addresses of user"
 msgstr "Показать адреса пользователя"
 
-#: plugins/personal/mail/mail_locals.tpl:40
-#: plugins/admin/groups/mail_locals.tpl:40
+#: plugins/personal/mail/mail_locals.tpl:33
+#: 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:34
-#: ihtml/themes/altlinux/login.tpl:38 ihtml/themes/classic/login.tpl:34
-#: ihtml/themes/classic/login.tpl:38 ihtml/themes/default/login.tpl:34
-#: ihtml/themes/default/login.tpl:38
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
 #: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Пароль"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:632
 msgid "Change password"
 msgstr "Сменить пароль"
 
@@ -672,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:19
-#: 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 "Изменить пароль"
 
@@ -691,13 +737,18 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:51
-#: plugins/addons/ldapmanager/contentcsv.tpl:124
-#: plugins/addons/ldapmanager/contentexport.tpl:70 include/functions.inc:1199
+#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: 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: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:94
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr "Назад"
@@ -713,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 "Вы не указали новый пароль."
 
@@ -744,13 +795,12 @@ msgstr "При попытке сменить пароль извне возни
 msgid "Select systems to add"
 msgstr "Выберите системы для добавления"
 
-#: plugins/personal/posix/trust_machines.tpl:29
-#: plugins/admin/systems/headpage.tpl:55
+#: plugins/personal/posix/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Показать системы в подразделении"
 
-#: plugins/personal/posix/trust_machines.tpl:35
-#: plugins/admin/systems/headpage.tpl:61
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:51
 msgid "Display systems matching"
 msgstr "Показать подходяшие системы"
 
@@ -758,94 +808,78 @@ msgstr "Показать подходяшие системы"
 msgid "Select groups to add"
 msgstr "Выберите группы для добавления"
 
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:36
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:37
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/users/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:36
-#: plugins/admin/departments/headpage.tpl:36
-#: plugins/admin/systems/headpage.tpl:37
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:37
-msgid "Filters"
-msgstr "Фильтры"
-
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:46
+#: plugins/personal/posix/posix_groups.tpl:27
+#: plugins/admin/groups/headpage.tpl:40
 msgid "Select to see groups that are primary groups of users"
 msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
 
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:46
+#: plugins/personal/posix/posix_groups.tpl:27
+#: plugins/admin/groups/headpage.tpl:41
 msgid "Show primary groups"
 msgstr "Показать основные группы"
 
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/personal/posix/posix_groups.tpl:28
+#: plugins/admin/groups/headpage.tpl:44
 msgid "Select to see groups that have samba groups mappings"
 msgstr "Выберите, чтобы просмотреть группы, которые входят в samba"
 
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/personal/posix/posix_groups.tpl:28
+#: plugins/admin/groups/headpage.tpl:45
 msgid "Show samba groups"
 msgstr "Показать группы samba"
 
-#: plugins/personal/posix/posix_groups.tpl:31
+#: plugins/personal/posix/posix_groups.tpl:29
 #: plugins/admin/groups/headpage.tpl:48
 msgid "Select to see groups that have applications configured"
 msgstr "Выберите, чтобы просмотреть список групп, которым доступны приложения"
 
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/admin/groups/headpage.tpl:49
 msgid "Show application groups"
 msgstr "Показать группы приложений"
 
-#: plugins/personal/posix/posix_groups.tpl:32
-#: plugins/admin/groups/headpage.tpl:49
+#: plugins/personal/posix/posix_groups.tpl:30
+#: plugins/admin/groups/headpage.tpl:52
 msgid "Select to see groups that have mail settings"
 msgstr ""
 "Выберите, чтобы просмотреть список групп, которым доступны функции эл. почты"
 
-#: plugins/personal/posix/posix_groups.tpl:32
-#: plugins/admin/groups/headpage.tpl:49
+#: plugins/personal/posix/posix_groups.tpl:30
+#: plugins/admin/groups/headpage.tpl:53
 msgid "Show mail groups"
 msgstr "Показать группы с эл. почтой"
 
-#: plugins/personal/posix/posix_groups.tpl:33
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/personal/posix/posix_groups.tpl:31
+#: plugins/admin/groups/headpage.tpl:56
 msgid "Select to see normal groups that have only functional aspects"
 msgstr "Выберите, чтобы просмотреть список обычных групп"
 
-#: plugins/personal/posix/posix_groups.tpl:33
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/personal/posix/posix_groups.tpl:31
+#: plugins/admin/groups/headpage.tpl:57
 msgid "Show functional groups"
 msgstr "Показать обычные группы"
 
 #: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:56 plugins/admin/ogroups/headpage.tpl:57
 msgid "Display groups of department"
 msgstr "Объединения в подразделении"
 
-#: plugins/personal/posix/posix_groups.tpl:42
-#: plugins/admin/groups/headpage.tpl:62 plugins/admin/ogroups/headpage.tpl:63
+#: plugins/personal/posix/posix_groups.tpl:48
+#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Шаблон для групп"
 
-#: plugins/personal/posix/posix_groups.tpl:43
-#: plugins/admin/groups/headpage.tpl:63 plugins/admin/ogroups/headpage.tpl:64
+#: plugins/personal/posix/posix_groups.tpl:51
+#: 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:46
-#: plugins/admin/groups/headpage.tpl:66
+#: plugins/personal/posix/posix_groups.tpl:58
+#: plugins/admin/groups/headpage.tpl:76
 msgid "Display groups of user"
 msgstr "Показать группы пользователей"
 
-#: plugins/personal/posix/posix_groups.tpl:47
-#: plugins/admin/groups/headpage.tpl:67
+#: plugins/personal/posix/posix_groups.tpl:61
+#: plugins/admin/groups/headpage.tpl:80
 msgid "User name of which groups are shown"
 msgstr "Имя пользователя, для которого перечисляются группы"
 
@@ -860,7 +894,7 @@ msgstr "Срок действия пароля истекает"
 
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
-#: plugins/personal/samba/class_sambaAccount.inc:609
+#: plugins/personal/samba/class_sambaAccount.inc:626
 msgid "Home directory"
 msgstr "Домашний каталог"
 
@@ -877,44 +911,44 @@ msgstr "Основная группа"
 msgid "Status"
 msgstr "Состояние"
 
-#: plugins/personal/posix/generic.tpl:38
+#: plugins/personal/posix/generic.tpl:39
 msgid "Force UID/GID"
 msgstr "Указать UID/GID вручную"
 
-#: plugins/personal/posix/generic.tpl:40
+#: plugins/personal/posix/generic.tpl:43
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/generic.tpl:45
+#: plugins/personal/posix/generic.tpl:52
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/generic.tpl:54
+#: plugins/personal/posix/generic.tpl:64
 msgid "Group membership"
 msgstr "Членство в группах"
 
-#: plugins/personal/posix/generic.tpl:56
+#: plugins/personal/posix/generic.tpl:66
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr ""
 "(Предупреждение: NFS не поддерживает более 16 групп для одного пользователя!)"
 
-#: plugins/personal/posix/generic.tpl:74
+#: plugins/personal/posix/generic.tpl:84
 msgid "Account"
 msgstr "Учетная запись"
 
-#: plugins/personal/posix/generic.tpl:89
+#: plugins/personal/posix/generic.tpl:98
 msgid "Environment"
 msgstr "Окружение"
 
-#: plugins/personal/posix/generic.tpl:92
+#: plugins/personal/posix/generic.tpl:101
 msgid "Default printer"
 msgstr "Принтер по умолчанию"
 
-#: plugins/personal/posix/generic.tpl:100
+#: plugins/personal/posix/generic.tpl:110
 msgid "Default language"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/posix/generic.tpl:113
+#: plugins/personal/posix/generic.tpl:123
 msgid "System trust"
 msgstr "Системные доверия"
 
@@ -927,31 +961,31 @@ msgstr "Атрибуты UNIX"
 msgid "UNIX"
 msgstr "Unix"
 
-#: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:908
+#: 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/admin/systems/class_terminalService.inc:121
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:99
+#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/admin/systems/class_terminalService.inc:122
+#: 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."
@@ -959,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."
@@ -967,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."
@@ -1004,225 +1038,227 @@ msgstr ""
 "(shadowWarning)"
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:344
-#: plugins/personal/samba/class_sambaAccount.inc:362
-#: plugins/personal/samba/class_sambaAccount.inc:380
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:352
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
 msgstr "Январь"
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:344
-#: plugins/personal/samba/class_sambaAccount.inc:362
-#: plugins/personal/samba/class_sambaAccount.inc:380
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:352
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
 msgstr "Февраль"
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:344
-#: plugins/personal/samba/class_sambaAccount.inc:362
-#: plugins/personal/samba/class_sambaAccount.inc:380
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:352
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
 msgstr "Март"
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:344
-#: plugins/personal/samba/class_sambaAccount.inc:362
-#: plugins/personal/samba/class_sambaAccount.inc:380
-#: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:352
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
 msgstr "Апрель"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
 msgstr "Май"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
 msgstr "Июнь"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
 msgstr "Июль"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
 msgstr "Август"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:353
+#: 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:223
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
 msgstr "Сентябрь"
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:354
+#: 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:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
 msgstr "Октябрь"
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:354
+#: 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:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
 msgstr "Ноябрь"
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:354
+#: 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:224
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
 msgstr "Декабрь"
 
-#: plugins/personal/posix/class_posixAccount.inc:516
-#: plugins/personal/samba/class_sambaAccount.inc:441
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/admin/systems/class_terminalGeneric.inc:62
 #: plugins/admin/systems/class_workstationGeneric.inc:70
+#: ihtml/themes/altlinux/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "отключен"
 
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:541
 msgid "full access"
 msgstr "полный доступ"
 
-#: plugins/personal/posix/class_posixAccount.inc:517
+#: plugins/personal/posix/class_posixAccount.inc:542
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: plugins/personal/posix/class_posixAccount.inc:675
+#: plugins/personal/posix/class_posixAccount.inc:710
 msgid "Failed: overriding lock"
 msgstr "Ошибка: замещение блокировки"
 
-#: plugins/personal/posix/class_posixAccount.inc:823
+#: plugins/personal/posix/class_posixAccount.inc:862
 msgid "The required field 'Home directory' is not set."
 msgstr "Обязательное поле \"Домашний каталог\" не заполнено."
 
-#: plugins/personal/posix/class_posixAccount.inc:826
+#: plugins/personal/posix/class_posixAccount.inc:865
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr "Введите корректный путь в поле \"Домашний каталог\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:834
+#: plugins/personal/posix/class_posixAccount.inc:873
 msgid "Value specified as 'UID' is not valid."
 msgstr "Значение поля \"UID\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:837
+#: plugins/personal/posix/class_posixAccount.inc:876
 msgid "Value specified as 'UID' is too small."
 msgstr "Значение 'UID' слишком маленькое."
 
-#: plugins/personal/posix/class_posixAccount.inc:841
-#: 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:844
-#: 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:853
+#: plugins/personal/posix/class_posixAccount.inc:891
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "Значение поля \"shadowMin\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:896
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "Значение поля \"shadowMax\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:863
+#: plugins/personal/posix/class_posixAccount.inc:901
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "Значение поля \"shadowWarning\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:866
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "Использование \"shadowWarning\" без \"shadowMax\" бессмысленно."
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: 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:872
+#: 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:877
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "Значение поля \"shadowInactive\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:880
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "Использование \"shadowInactive\" без \"shadowMax\" бессмысленно."
 
-#: plugins/personal/posix/class_posixAccount.inc:885
+#: 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:987
-#: 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 "Слишком много пользователей, невозможно создать идентификатор!"
 
@@ -1236,7 +1272,7 @@ msgstr "Путь к сценариям"
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:75
-#: plugins/personal/samba/class_sambaAccount.inc:610
+#: plugins/personal/samba/class_sambaAccount.inc:627
 msgid "Profile path"
 msgstr "Путь к профилю"
 
@@ -1285,17 +1321,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Настройки таймаута (в минутах)"
 
 #: plugins/personal/samba/samba3.tpl:116
-#: plugins/personal/samba/class_sambaAccount.inc:617
+#: plugins/personal/samba/class_sambaAccount.inc:634
 msgid "Connection"
 msgstr "Подключение"
 
 #: plugins/personal/samba/samba3.tpl:125
-#: plugins/personal/samba/class_sambaAccount.inc:618
+#: plugins/personal/samba/class_sambaAccount.inc:635
 msgid "Disconnection"
 msgstr "Отключение"
 
 #: plugins/personal/samba/samba3.tpl:134
-#: plugins/personal/samba/class_sambaAccount.inc:619
+#: plugins/personal/samba/class_sambaAccount.inc:636
 msgid "IDLE"
 msgstr "Простой"
 
@@ -1361,11 +1397,11 @@ msgstr "Настройки Samba"
 msgid "Select workstations to add"
 msgstr "Выберите рабочие станции для добавления"
 
-#: plugins/personal/samba/samba3_workstations.tpl:29
+#: plugins/personal/samba/samba3_workstations.tpl:26
 msgid "Display workstations of department"
 msgstr "Показать рабочие станции подразделения"
 
-#: plugins/personal/samba/samba3_workstations.tpl:35
+#: plugins/personal/samba/samba3_workstations.tpl:30
 msgid "Display workstations matching"
 msgstr "Показать соответствующие рабочие станции"
 
@@ -1406,50 +1442,50 @@ msgstr ""
 "В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
 "атрибуты POSIX, включите сначала их использование."
 
-#: plugins/personal/samba/class_sambaAccount.inc:442
+#: plugins/personal/samba/class_sambaAccount.inc:451
 msgid "input on, notify on"
 msgstr "входящие вкл, оповещение вкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:443
+#: plugins/personal/samba/class_sambaAccount.inc:452
 msgid "input on, notify off"
 msgstr "входящие вкл, оповещение выкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:444
+#: plugins/personal/samba/class_sambaAccount.inc:453
 msgid "input off, notify on"
 msgstr "входящие выкл, оповещение вкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:445
+#: plugins/personal/samba/class_sambaAccount.inc:454
 msgid "input off, nofify off"
 msgstr "входящие выкл, оповещение выкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:447
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "disconnect"
 msgstr "отключиться"
 
-#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "reset"
 msgstr "сброс"
 
-#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "from any client"
 msgstr "от любого клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "from previous client only"
 msgstr "только от предыдущего клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:612
+#: plugins/personal/samba/class_sambaAccount.inc:629
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Значение '%s' содержит недопустимые символы."
 
-#: plugins/personal/samba/class_sambaAccount.inc:622
+#: plugins/personal/samba/class_sambaAccount.inc:639
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr "Значение таймаута '%s' пустое или содержит недопустимые символы."
 
-#: plugins/personal/samba/class_sambaAccount.inc:628
+#: plugins/personal/samba/class_sambaAccount.inc:645
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1457,7 +1493,7 @@ msgstr ""
 "Менеджер пользователей Windows допускает подключение только восми клиентов. "
 "Вы указали больше чем восем."
 
-#: plugins/personal/samba/class_sambaAccount.inc:805
+#: plugins/personal/samba/class_sambaAccount.inc:822
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1465,7 +1501,7 @@ msgstr ""
 "Внимание: этот аккаунт имеет неправильный SID. Это нельзя исправить "
 "средствами GOsa."
 
-#: plugins/personal/samba/class_sambaAccount.inc:830
+#: plugins/personal/samba/class_sambaAccount.inc:847
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1473,83 +1509,90 @@ msgstr ""
 "Предупреждение: не удается идентифицировать основную группу, преобразование "
 "в группу Samba невозможно!"
 
-#: plugins/personal/generic/class_user.inc:225
+#: plugins/personal/generic/class_user.inc:233
 msgid "female"
 msgstr "женский"
 
-#: plugins/personal/generic/class_user.inc:225
+#: plugins/personal/generic/class_user.inc:233
 msgid "male"
 msgstr "мужской"
 
-#: plugins/personal/generic/class_user.inc:235
+#: plugins/personal/generic/class_user.inc:243
 msgid "This account has no valid GOsa extensions."
 msgstr "Для этой учетной записи нет корректных расширений GOsa."
 
-#: plugins/personal/generic/class_user.inc:264
+#: 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:358
+#: plugins/personal/generic/class_user.inc:367
 msgid "Please enter a valid serial number"
 msgstr "Введите корректный серийный номер"
 
-#: plugins/personal/generic/class_user.inc:362
-#: plugins/personal/generic/class_user.inc:387
-#: plugins/admin/systems/class_terminalInfo.inc:52
-#: plugins/admin/systems/class_terminalInfo.inc:167
-msgid "present"
-msgstr "присутствует"
+#: 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:404
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
-#: plugins/personal/generic/class_user.inc:389
-msgid "absent"
-msgstr "оÑ\82Ñ\81Ñ\83Ñ\82Ñ\81Ñ\82вÑ\83еÑ\82"
+#: plugins/personal/generic/class_user.inc:408
+#, fuzzy
+msgid "No certificate installed"
+msgstr "Ð\98змениÑ\82Ñ\8c Ñ\81еÑ\80Ñ\82иÑ\84икаÑ\82Ñ\8b"
 
-#: plugins/personal/generic/class_user.inc:777
+#: plugins/personal/generic/class_user.inc:808
 msgid "Kerberos database communication failed"
 msgstr "Ошибка соединения с базой данных Kerberos"
 
-#: plugins/personal/generic/class_user.inc:794
+#: plugins/personal/generic/class_user.inc:825
 msgid "Can't remove user from kerberos database."
 msgstr "Не удается удалить пользователя из базы данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:805
+#: plugins/personal/generic/class_user.inc:836
 msgid "Can't add user to kerberos database."
 msgstr "Не удается добавить пользователя в базу данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:845
+#: 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:850
+#: 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:856
-#: plugins/addons/addressbook/class_addressbook.inc:508
-#: plugins/admin/users/class_userManagement.inc:422
+#: 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:865
+#: 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:871
-#: plugins/addons/addressbook/class_addressbook.inc:512
-#: plugins/admin/users/class_userManagement.inc:425
+#: 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:874
+#: plugins/personal/generic/class_user.inc:905
 msgid "The required field 'Login' is not set."
 msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:881
+#: plugins/personal/generic/class_user.inc:912
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1557,7 +1600,7 @@ msgstr ""
 "Пользователь с такой комбинацией имени и личного имени в базе данных уже "
 "существует."
 
-#: plugins/personal/generic/class_user.inc:888
+#: plugins/personal/generic/class_user.inc:919
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1565,49 +1608,54 @@ msgstr ""
 "Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
 "Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/personal/generic/class_user.inc:891
+#: plugins/personal/generic/class_user.inc:922
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
 
-#: plugins/personal/generic/class_user.inc:894
-#: plugins/personal/generic/class_user.inc:922
-#: plugins/addons/addressbook/class_addressbook.inc:518
-#: plugins/addons/addressbook/class_addressbook.inc:546
-#: 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:897
-#: plugins/personal/generic/class_user.inc:919
-#: plugins/addons/addressbook/class_addressbook.inc:521
-#: plugins/addons/addressbook/class_addressbook.inc:543
+#: 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:902
-#: plugins/personal/generic/class_user.inc:905
-#: plugins/addons/addressbook/class_addressbook.inc:526
-#: plugins/addons/addressbook/class_addressbook.inc:529
-#: 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:908
-#: plugins/addons/addressbook/class_addressbook.inc:532
-#: 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:911
-#: plugins/addons/addressbook/class_addressbook.inc:535
+#: 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:914
-#: plugins/addons/addressbook/class_addressbook.inc:538
+#: 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:1070
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "Невозможно выбрать базу данных!"
+
 #: plugins/personal/generic/password.tpl:2
 msgid ""
 "You have changed the method your password is stored in the ldap database. "
@@ -1633,26 +1681,26 @@ 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:485
-#: plugins/admin/users/template.tpl:19
+#: 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:485
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr "Имя"
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:29
+#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
 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 "Обращение"
@@ -1684,6 +1732,7 @@ msgstr "Пол"
 #: plugins/admin/systems/workstation.tpl:18
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
+#: plugins/gofon/macro/generic.tpl:20
 msgid "Base"
 msgstr "Ветка"
 
@@ -1693,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
@@ -1714,7 +1763,7 @@ msgid "Password storage"
 msgstr "Хэширование паролей"
 
 #: plugins/personal/generic/generic.tpl:138
-#: plugins/personal/generic/generic_certs.tpl:7
+#: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Сертификаты"
 
@@ -1739,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 "Подразделение"
@@ -1764,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 "Пейджер"
@@ -1820,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 "Почтовый индекс"
@@ -1837,7 +1894,7 @@ msgstr "Воспользуйтесь закладкой \"Телефон\""
 msgid "Last delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/generic/generic.tpl:378
+#: plugins/personal/generic/generic.tpl:377
 msgid "Public visible"
 msgstr "Видимый всем"
 
@@ -1846,35 +1903,34 @@ 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 "Сохранить"
 
-#: plugins/personal/generic/generic_certs.tpl:14
+#: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Стандартный сертификат"
 
-#: plugins/personal/generic/generic_certs.tpl:19
-#: plugins/personal/generic/generic_certs.tpl:30
-#: plugins/personal/generic/generic_certs.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:198
+#: plugins/personal/generic/generic_certs.tpl:17
+#: plugins/personal/generic/generic_certs.tpl:37
+#: plugins/personal/generic/generic_certs.tpl:57
+#: 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:209
-#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/classic/islocked.tpl:13
-#: ihtml/themes/default/islocked.tpl:13
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:635
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Удалить"
 
-#: plugins/personal/generic/generic_certs.tpl:25
+#: plugins/personal/generic/generic_certs.tpl:28
 msgid "S/MIME certificate"
 msgstr "Сертификат S/MIME"
 
-#: plugins/personal/generic/generic_certs.tpl:36
+#: plugins/personal/generic/generic_certs.tpl:48
 msgid "PKCS12 certificate"
 msgstr "Сертификат PKCS12"
 
-#: plugins/personal/generic/generic_certs.tpl:48
+#: plugins/personal/generic/generic_certs.tpl:65
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
@@ -1891,23 +1947,23 @@ msgstr "Общая информация о пользователе"
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:120
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:123
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "Значение поля \"Пропускная способность (с сервера)\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:126
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
 msgid "Value specified as 'Files' is not valid."
 msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:129
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
 msgid "Value specified as 'Size' is not valid."
 msgstr "Значение поля \"Размер\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:132
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "Значение поля \"Отношение\" некорректно."
 
@@ -1915,25 +1971,25 @@ msgstr "Значение поля \"Отношение\" некорректно.
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/proxy.tpl:1
+#: plugins/personal/connectivity/proxy.tpl:16
 msgid "Proxy account"
 msgstr "Аккаунт Proxy"
 
-#: plugins/personal/connectivity/proxy.tpl:8
+#: plugins/personal/connectivity/proxy.tpl:24
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
 "Фильтровать нежелательное содержимое (например, порнографическое или "
 "связанное с насилием)"
 
-#: plugins/personal/connectivity/proxy.tpl:13
+#: plugins/personal/connectivity/proxy.tpl:35
 msgid "Limit proxy access to working time"
 msgstr "Ограничить доступ к прокси рабочим временем"
 
-#: plugins/personal/connectivity/proxy.tpl:42
+#: plugins/personal/connectivity/proxy.tpl:69
 msgid "Restrict proxy usage by quota"
 msgstr "Ограничить квотой использование прокси"
 
-#: plugins/personal/connectivity/proxy.tpl:52
+#: plugins/personal/connectivity/proxy.tpl:80
 msgid "per"
 msgstr "per"
 
@@ -1978,25 +2034,25 @@ msgstr ""
 msgid "Manual"
 msgstr "Январь"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:172
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:224
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
 #, fuzzy
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:243
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:251
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
@@ -2025,36 +2081,36 @@ msgstr ""
 msgid "Delegations"
 msgstr "Назначение"
 
-#: plugins/personal/connectivity/kolab.tpl:22
+#: plugins/personal/connectivity/kolab.tpl:23
 #, fuzzy
 msgid "Mail size"
 msgstr "Размер квоты"
 
-#: plugins/personal/connectivity/kolab.tpl:23
+#: plugins/personal/connectivity/kolab.tpl:24
 msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:31
+#: plugins/personal/connectivity/kolab.tpl:32
 #, fuzzy
 msgid "Free Busy information"
 msgstr "Общая информация о пользователе"
 
-#: plugins/personal/connectivity/kolab.tpl:34
+#: plugins/personal/connectivity/kolab.tpl:35
 msgid "URL"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:38
+#: plugins/personal/connectivity/kolab.tpl:39
 msgid "Future"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:39
+#: plugins/personal/connectivity/kolab.tpl:40
 #: plugins/personal/connectivity/oxchange.tpl:18
 #: plugins/personal/connectivity/oxchange.tpl:22
 #, fuzzy
 msgid "days"
 msgstr "день"
 
-#: plugins/personal/connectivity/kolab.tpl:44
+#: plugins/personal/connectivity/kolab.tpl:45
 msgid "Invitation policy"
 msgstr ""
 
@@ -2062,23 +2118,41 @@ msgstr ""
 msgid "WebDAV account"
 msgstr "Учетная запись WebDAV"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:5
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:663
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
+"атрибуты POSIX, включите сначала их использование."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
+"атрибуты POSIX, включите сначала их использование."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
 #, fuzzy
 msgid "Couldn't Connect To Postgresql Database"
 msgstr "Невозможно подключиться к серверу базы данных!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:667
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:730
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
 msgid "Needed Parameters to openexchange connectivity plugin failed!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:671
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
 #, fuzzy
 msgid "PHP4 module for Postgresql Database Failed!"
 msgstr "Невозможно выполнить запрос к базе данных журналов!"
@@ -2167,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 "В этой учетной записи нет атрибутов для подключения."
@@ -2176,30 +2255,43 @@ msgstr "В этой учетной записи нет атрибутов для
 msgid "Proxy"
 msgstr "Прокси-сервер"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:69
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:70
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
 msgid "hour"
 msgstr "час"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:70
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
 msgid "day"
 msgstr "день"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:70
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
 msgid "week"
 msgstr "неделя"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:70
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
 msgid "month"
 msgstr "месяц"
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:128
+msgid "Numerical value for Quota Setting is empty."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:131
+#, fuzzy
+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 "Список"
@@ -2212,46 +2304,48 @@ msgstr "Имя стоп-листа"
 msgid "Select subtree to place blocklist in"
 msgstr "Выберите ветку стоп-листа"
 
-#: plugins/gofax/blocklists/generic.tpl:31
+#: plugins/gofax/blocklists/generic.tpl:32
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/functions.inc:1588
+#: include/php_setup.inc:122
 msgid "Type"
 msgstr "Тип"
 
-#: plugins/gofax/blocklists/generic.tpl:33
+#: plugins/gofax/blocklists/generic.tpl:34
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
 
-#: plugins/gofax/blocklists/generic.tpl:39 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:24
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
 #: plugins/admin/systems/printer.tpl:10
 #: plugins/admin/systems/wingeneric.tpl:24
 #: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
 #: plugins/generic/references/contents.tpl:11
 msgid "Description"
 msgstr "Описание"
 
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:43
 msgid "Descriptive text for this blocklist"
 msgstr "Описание стоп-листа"
 
-#: plugins/gofax/blocklists/generic.tpl:54
+#: plugins/gofax/blocklists/generic.tpl:56
 msgid "Blocked numbers"
 msgstr "Блокируемые номера"
 
-#: plugins/gofax/blocklists/generic.tpl:64
-#: plugins/gofax/blocklists/headpage.tpl:24
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:25 plugins/admin/users/headpage.tpl:26
-#: plugins/admin/applications/headpage.tpl:24
-#: plugins/admin/departments/headpage.tpl:24
-#: plugins/admin/systems/headpage.tpl:25 plugins/admin/ogroups/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 "Информация"
 
-#: plugins/gofax/blocklists/generic.tpl:66
+#: plugins/gofax/blocklists/generic.tpl:69
 msgid "Numbers can also contain wild cards."
 msgstr "Вместо точных номеров можно использовать шаблоны."
 
@@ -2259,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 "Недостаточно прав для создания стоп-листа в этой ветке."
 
@@ -2305,10 +2573,10 @@ msgstr "Недостаточно прав для создания стоп-ли
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2 html/index.php:215
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/classic/conflict.tpl:6 ihtml/themes/classic/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: html/index.php:231 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -2323,7 +2591,7 @@ msgstr ""
 #: plugins/gofax/blocklists/remove.tpl:11
 #: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
 #: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
-#: plugins/admin/ogroups/remove.tpl:11
+#: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
 msgid ""
 "So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
 "abort."
@@ -2335,15 +2603,7 @@ msgstr ""
 msgid "List of blocklists"
 msgstr "Стоп-листы"
 
-#: plugins/gofax/blocklists/headpage.tpl:15
-#: plugins/admin/groups/headpage.tpl:15 plugins/admin/users/headpage.tpl:15
-#: plugins/admin/applications/headpage.tpl:15
-#: plugins/admin/departments/headpage.tpl:15
-#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:15
-msgid "New"
-msgstr "Создать"
-
-#: plugins/gofax/blocklists/headpage.tpl:28
+#: plugins/gofax/blocklists/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to create, delete and edit selected blocklists. Having "
@@ -2354,50 +2614,35 @@ msgstr ""
 "листы. Если у вас достаточно большое количество списков, вы можете "
 "использовать групповое выделение."
 
-#: plugins/gofax/blocklists/headpage.tpl:31
-#, 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:45
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Select to see send blocklists"
 msgstr "Выберите, чтобы просмотреть стоп-листы (отправка)"
 
-#: plugins/gofax/blocklists/headpage.tpl:45
+#: plugins/gofax/blocklists/headpage.tpl:38
 msgid "Show send blocklists"
 msgstr "Показать стоп-листы отправки"
 
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:39
 msgid "Select to see receive blocklists"
 msgstr "Выберите, чтобы просмотреть стоп-листы (получение)"
 
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:39
 msgid "Show receive blocklists"
 msgstr "Показать стоп-листы получения"
 
-#: plugins/gofax/blocklists/headpage.tpl:49
-msgid "Display lists of department"
-msgstr "Стоп-листы в подразделении"
-
-#: plugins/gofax/blocklists/headpage.tpl:55
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Display lists matching"
 msgstr "Шаблон для стоп-листов"
 
-#: plugins/gofax/blocklists/headpage.tpl:56
+#: plugins/gofax/blocklists/headpage.tpl:51
 msgid "Regular expression for matching list names"
 msgstr "Регулярное выражение, соответствующее именам списков"
 
-#: plugins/gofax/blocklists/headpage.tpl:59
+#: plugins/gofax/blocklists/headpage.tpl:62
 msgid "Display lists containing"
 msgstr "Шаблон для содержимого стоп-листов"
 
-#: plugins/gofax/blocklists/headpage.tpl:60
+#: plugins/gofax/blocklists/headpage.tpl:65
 msgid "Show lists containing entered numbers"
 msgstr "Показать \"черные списки\", содержащие введенные номера"
 
@@ -2447,19 +2692,19 @@ msgstr "Отправлять факсы по эл. почте"
 msgid "Deliver fax to printer"
 msgstr "Отправлять факсы на принтер"
 
-#: plugins/gofax/faxaccount/generic.tpl:68
+#: plugins/gofax/faxaccount/generic.tpl:69
 msgid "Alternate fax numbers"
 msgstr "Альтернативные номера факсов"
 
-#: plugins/gofax/faxaccount/generic.tpl:83
+#: plugins/gofax/faxaccount/generic.tpl:85
 msgid "Blocklists"
 msgstr "\"Черные списки\""
 
-#: plugins/gofax/faxaccount/generic.tpl:86
+#: plugins/gofax/faxaccount/generic.tpl:88
 msgid "Blocklists for incoming fax"
 msgstr "\"Черные списки\" для входящих факсов"
 
-#: plugins/gofax/faxaccount/generic.tpl:92
+#: plugins/gofax/faxaccount/generic.tpl:94
 msgid "Blocklists for outgoing fax"
 msgstr "\"Черные списки\" для исходящих факсов"
 
@@ -2471,19 +2716,19 @@ msgstr "Выбрать номера для добавления"
 msgid "Display numbers of department"
 msgstr "Показать номера из подразделения"
 
-#: plugins/gofax/faxaccount/locals.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:40
 msgid "Display numbers matching"
 msgstr "Показать совпадения номеров"
 
-#: plugins/gofax/faxaccount/locals.tpl:35
+#: plugins/gofax/faxaccount/locals.tpl:43
 msgid "Regular expression for matching numbers"
 msgstr "Регулярное выражение, соответствующее номерам"
 
-#: plugins/gofax/faxaccount/locals.tpl:38
+#: plugins/gofax/faxaccount/locals.tpl:49
 msgid "Display numbers of user"
 msgstr "Показать номера пользователя"
 
-#: plugins/gofax/faxaccount/locals.tpl:39
+#: plugins/gofax/faxaccount/locals.tpl:52
 msgid "User name of which numbers are shown"
 msgstr "Имя пользователя, для которого перечисляются номера"
 
@@ -2491,23 +2736,23 @@ msgstr "Имя пользователя, для которого перечис
 msgid "Blocked numbers/lists"
 msgstr "Блокируемые номера/списки"
 
-#: plugins/gofax/faxaccount/lists.tpl:18
+#: plugins/gofax/faxaccount/lists.tpl:19
 #: plugins/admin/groups/mail_admins.tpl:24
 msgid "Select a specific department"
 msgstr "Выберите подразделение."
 
-#: plugins/gofax/faxaccount/lists.tpl:24 plugins/admin/groups/acl.tpl:12
+#: plugins/gofax/faxaccount/lists.tpl:25 plugins/admin/groups/acl.tpl:12
 #: plugins/admin/groups/mail_admins.tpl:30
 msgid "Choose"
 msgstr "Выбрать"
 
-#: plugins/gofax/faxaccount/lists.tpl:26
+#: plugins/gofax/faxaccount/lists.tpl:27
 msgid "List of predefined blocklists"
 msgstr "Готовые \"черные списки\""
 
-#: plugins/gofax/faxaccount/lists.tpl:35
+#: plugins/gofax/faxaccount/lists.tpl:37
 #: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1190
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1260
 msgid "Apply"
 msgstr "Применить"
 
@@ -2516,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"
@@ -2554,23 +2799,29 @@ msgstr ""
 msgid "You're trying to add an invalid phone number."
 msgstr "Вы пытаетесь ввести некорректный номер телефона."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:462
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
 msgid "The required field 'Fax' is not set."
 msgstr "Обязательное поле \"Факс\" не заполнено."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:466
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Введите корректный номер телефона в поле \"Факс\"."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:482
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:476
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:484
 #, fuzzy
 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 "Предварительный просмотр - пожалуйста, подождите"
@@ -2584,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 "Пользователь"
 
@@ -2625,8 +2877,8 @@ msgid "Filter"
 msgstr "Фильтр"
 
 #: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:77
-#: plugins/addons/logview/contents.tpl:45 plugins/gofon/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
 msgid "Search for"
 msgstr "Поиск"
 
@@ -2648,13 +2900,13 @@ msgid "during"
 msgstr "в течение"
 
 #: plugins/gofax/reports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:65
-#: plugins/gofon/reports/contents.tpl:21
+#: plugins/addons/logview/contents.tpl:67
+#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 msgid "Search"
 msgstr "Поиск"
 
 #: plugins/gofax/reports/contents.tpl:31
-#: plugins/addons/logview/contents.tpl:83
+#: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
 msgid "Date"
 msgstr "Дата"
@@ -2668,7 +2920,7 @@ msgid "Receiver"
 msgstr "Получатель"
 
 #: plugins/gofax/reports/contents.tpl:47
-#: plugins/addons/logview/contents.tpl:96
+#: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr "Не найдено..."
@@ -2708,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 "Личный"
@@ -2728,10 +2980,6 @@ msgstr ""
 "например, \"И*н\", чтобы найти имя \"Иван\". Уточнить результаты поиска "
 "можно с помощью фильтров ниже."
 
-#: plugins/addons/addressbook/contents.tpl:42
-msgid "Actions"
-msgstr "Действия"
-
 #: plugins/addons/addressbook/contents.tpl:47
 msgid "Add entry"
 msgstr "Добавить объект"
@@ -2744,85 +2992,85 @@ msgstr "Редактиовать объект"
 msgid "Remove entry"
 msgstr "Удалить объект"
 
-#: plugins/addons/addressbook/contents.tpl:67
+#: plugins/addons/addressbook/contents.tpl:68
 msgid "Select to see regular users"
 msgstr "Выберите, чтобы просмотреть пользователей"
 
-#: plugins/addons/addressbook/contents.tpl:67
+#: plugins/addons/addressbook/contents.tpl:68
 msgid "Show organizational entries"
 msgstr "Показать организационные объекты"
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:69
 msgid "Select to see users in addressbook"
 msgstr "Выберите, чтобы просмотреть пользователей в адресной книге"
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:69
 msgid "Show addressbook entries"
 msgstr "Показать объекты адресной книги"
 
-#: plugins/addons/addressbook/contents.tpl:71
+#: plugins/addons/addressbook/contents.tpl:77
 msgid "Display results for department"
 msgstr "Показать результаты для подразделения"
 
-#: plugins/addons/addressbook/contents.tpl:78
-msgid "Search string"
-msgstr "Строка поиска"
-
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:90
 msgid "Match object"
 msgstr "Соответствующий объект"
 
-#: plugins/addons/addressbook/contents.tpl:83
+#: 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 "Соединение..."
 
-#: plugins/addons/addressbook/dial.tpl:11
-#: plugins/addons/addressbook/class_addressbook.inc:354
-#: plugins/addons/addressbook/class_addressbook.inc:356
-#: plugins/addons/addressbook/class_addressbook.inc:357
-#: plugins/addons/addressbook/class_addressbook.inc:435
+#: plugins/addons/addressbook/dial.tpl:10
+#: 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: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 "Страна"
@@ -2844,84 +3092,84 @@ msgstr "Адресная книга"
 msgid "Addressbook"
 msgstr "Адресная книга"
 
-#: plugins/addons/addressbook/class_addressbook.inc:147
+#: plugins/addons/addressbook/class_addressbook.inc:149
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Звоним с %s на %s?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:151
+#: plugins/addons/addressbook/class_addressbook.inc:153
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
 msgstr ""
 "У вас нет персонального набора телефонов. Настройте это прежде чем звонить."
 
-#: plugins/addons/addressbook/class_addressbook.inc:180
-#: plugins/addons/addressbook/class_addressbook.inc:284
+#: plugins/addons/addressbook/class_addressbook.inc:182
+#: plugins/addons/addressbook/class_addressbook.inc:286
 msgid "You are not allowed to delete this entry!"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:278
+#: plugins/addons/addressbook/class_addressbook.inc:280
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Вы собираетесь удалить объект %s."
 
-#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:376
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Сохранить контактную информацию %s в формате vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:363
+#: plugins/addons/addressbook/class_addressbook.inc:380
 #, php-format
 msgid "Send mail to %s"
 msgstr "Отправить %s сообщение по эл. почте"
 
-#: plugins/addons/addressbook/class_addressbook.inc:447
+#: plugins/addons/addressbook/class_addressbook.inc:466
 msgid "global addressbook"
 msgstr "общая адресная книга"
 
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:469
 msgid "organizations user database"
 msgstr "база пользователя"
 
-#: plugins/addons/addressbook/class_addressbook.inc:454
+#: plugins/addons/addressbook/class_addressbook.inc:473
 #, php-format
 msgid "Contact stored in %s"
 msgstr "Контакт сохранен в %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:456
+#: plugins/addons/addressbook/class_addressbook.inc:475
 msgid "Creating new entry in"
 msgstr "Создание нового объекта в"
 
-#: plugins/addons/addressbook/class_addressbook.inc:485
+#: 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:486
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Work phone"
 msgstr "Рабочий телефон"
 
-#: plugins/addons/addressbook/class_addressbook.inc:486
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Cell phone"
 msgstr "Сотовый телефон"
 
-#: plugins/addons/addressbook/class_addressbook.inc:487
+#: plugins/addons/addressbook/class_addressbook.inc:506
 msgid "Home phone"
 msgstr "Домашний телефон"
 
-#: plugins/addons/addressbook/class_addressbook.inc:487
+#: plugins/addons/addressbook/class_addressbook.inc:506
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
-#: plugins/addons/addressbook/class_addressbook.inc:559
+#: 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:571
+#: plugins/addons/addressbook/class_addressbook.inc:590
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -2965,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 ""
 
@@ -2996,25 +3244,25 @@ msgstr ""
 "LDAPв формате ldif. Эти образы можно сохранять как резервные копии или "
 "использовать при инициализации нового сервера."
 
-#: plugins/addons/ldapmanager/contentimport.tpl:12
+#: plugins/addons/ldapmanager/contentimport.tpl:10
 msgid "Import LDIF File"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:17
-#: plugins/addons/ldapmanager/contentcsv.tpl:15
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
 msgid "Browse"
 msgstr "Просмотр"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:26
+#: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:39
+#: plugins/addons/ldapmanager/contentimport.tpl:33
 #, fuzzy
 msgid "Overwrite existing entry"
 msgstr "Экспорт объекта"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:47
+#: plugins/addons/ldapmanager/contentimport.tpl:40
 #, fuzzy
 msgid "Import successful"
 msgstr "Импорт успешен."
@@ -3027,28 +3275,28 @@ msgid ""
 "least the UID, GIVENNAME and SURENAME set."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:11
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
 msgid "Select CSV file to import"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:20
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
 #, fuzzy
 msgid "Select template"
 msgstr "Создать шаблон"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:35
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
 msgid "All entries have been written to the LDAP database successfully."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:37
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
 msgid "Oups. There was an error during the import of your data."
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:40
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
 msgid "Here is the status report for the import:"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:88
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
 #, fuzzy
 msgid "Selected Template"
 msgstr "Выберите режим терминала"
@@ -3058,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 ""
 
@@ -3073,33 +3321,33 @@ msgstr ""
 "LDAPв формате ldif. Эти образы можно сохранять как резервные копии или "
 "использовать при инициализации нового сервера."
 
-#: plugins/addons/ldapmanager/contentexport.tpl:13
+#: plugins/addons/ldapmanager/contentexport.tpl:10
 msgid "Export single entry"
 msgstr "Экспорт объекта"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:24
+#: plugins/addons/ldapmanager/contentexport.tpl:21
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:27
-#: plugins/addons/ldapmanager/contentexport.tpl:42
+#: plugins/addons/ldapmanager/contentexport.tpl:24
+#: plugins/addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr "Выбрать подразделение для экспорта"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:39
+#: plugins/addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:59
+#: plugins/addons/ldapmanager/contentexport.tpl:55
 #, fuzzy
 msgid "Export successful"
 msgstr "Экспорт успешен."
 
-#: plugins/addons/ldapmanager/contentexport.tpl:63
+#: plugins/addons/ldapmanager/contentexport.tpl:59
 msgid "Click here to save the complete LDAP database to a file"
 msgstr "Щелкните здесь, чтобы сохранить образ базы данных LDAP в файл"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:63
+#: plugins/addons/ldapmanager/contentexport.tpl:59
 msgid "Click here to save the LDAP Export "
 msgstr "Щелкните здесь, чтобы сохранить результаты экспорта"
 
@@ -3178,7 +3426,7 @@ msgstr "один месяц"
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: plugins/addons/logview/contents.tpl:12
+#: plugins/addons/logview/contents.tpl:11
 msgid "Show hosts"
 msgstr "Показать хосты"
 
@@ -3186,27 +3434,27 @@ msgstr "Показать хосты"
 msgid "Log level"
 msgstr "Уровень информативности"
 
-#: plugins/addons/logview/contents.tpl:37
+#: plugins/addons/logview/contents.tpl:38
 msgid "Time interval"
 msgstr "Интервал времени"
 
-#: plugins/addons/logview/contents.tpl:46
+#: plugins/addons/logview/contents.tpl:48
 msgid "Enter string to search for"
 msgstr "Введите строку для поиска"
 
-#: plugins/addons/logview/contents.tpl:58
+#: plugins/addons/logview/contents.tpl:60
 msgid "Ruleset"
 msgstr "Набор правил"
 
-#: plugins/addons/logview/contents.tpl:81
+#: plugins/addons/logview/contents.tpl:82
 msgid "Level"
 msgstr "Уровень"
 
-#: plugins/addons/logview/contents.tpl:82
+#: plugins/addons/logview/contents.tpl:83
 msgid "Hostname"
 msgstr "Имя системы"
 
-#: plugins/addons/logview/contents.tpl:84
+#: plugins/addons/logview/contents.tpl:85
 msgid "Message"
 msgstr "Сообщение"
 
@@ -3218,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."
@@ -3256,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 "Группа с таким именем уже существует."
 
@@ -3269,19 +3517,19 @@ msgstr "Основной адрес эл. почты для этой общей
 msgid "Select mail server to place user on"
 msgstr "Выберите почтовый сервер для пользователя"
 
-#: plugins/admin/groups/mail.tpl:64
+#: plugins/admin/groups/mail.tpl:66
 msgid "IMAP shared folders"
 msgstr "Общие папки IMAP"
 
-#: plugins/admin/groups/mail.tpl:68
+#: plugins/admin/groups/mail.tpl:70
 msgid "Default permission"
 msgstr "Права по умолчанию"
 
-#: plugins/admin/groups/mail.tpl:76
+#: plugins/admin/groups/mail.tpl:79
 msgid "Member permission"
 msgstr "Права для членов группы"
 
-#: plugins/admin/groups/mail.tpl:91
+#: plugins/admin/groups/mail.tpl:94
 msgid "Forward messages to non group members"
 msgstr "Пересылать сообщения не членам группы"
 
@@ -3289,7 +3537,7 @@ msgstr "Пересылать сообщения не членам группы"
 msgid "List of groups"
 msgstr "Список групп"
 
-#: plugins/admin/groups/headpage.tpl:29
+#: plugins/admin/groups/headpage.tpl:25
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit and remove selected groups. You may want "
@@ -3300,24 +3548,6 @@ msgstr ""
 "группы пользователей. Если у вас их достаточно большое количество, вы можете "
 "использовать групповое выделение."
 
-#: plugins/admin/groups/headpage.tpl:32 plugins/admin/ogroups/headpage.tpl:32
-#, 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:53 plugins/admin/users/headpage.tpl:57
-msgid "Dive into LDAP subtrees when searching"
-msgstr "Искать в поддеревьях LDAP"
-
-#: plugins/admin/groups/headpage.tpl:53 plugins/admin/users/headpage.tpl:57
-msgid "Search in subtrees"
-msgstr "Искать в поддеревьях"
-
 #: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
 msgid "Group administration"
 msgstr "Управление группами"
@@ -3327,16 +3557,76 @@ msgstr "Управление группами"
 msgid "Groups"
 msgstr "Группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:202
+#: 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:208
-#: plugins/admin/groups/class_groupManagement.inc:234
+#: 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 "
@@ -3386,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 "Объект"
@@ -3398,15 +3698,15 @@ msgstr "Применить эти права доступа только к со
 msgid "Used applications"
 msgstr "Используемые приложения"
 
-#: plugins/admin/groups/application.tpl:10
+#: plugins/admin/groups/application.tpl:11
 msgid "Edit parameters"
 msgstr "Изменить параметры"
 
-#: plugins/admin/groups/application.tpl:10
+#: plugins/admin/groups/application.tpl:11
 msgid "Edit optional application parameters"
 msgstr "Изменить дополнительные параметры приложения"
 
-#: plugins/admin/groups/application.tpl:20
+#: plugins/admin/groups/application.tpl:21
 msgid "Available applications"
 msgstr "Доступные приложения"
 
@@ -3414,18 +3714,17 @@ msgstr "Доступные приложения"
 msgid "Select users to add"
 msgstr "Выбрать пользователей для добавления"
 
-#: plugins/admin/groups/group_objects.tpl:29
-#: plugins/admin/users/headpage.tpl:60
+#: plugins/admin/groups/group_objects.tpl:30
 msgid "Display users of department"
 msgstr "Подразделение"
 
-#: plugins/admin/groups/group_objects.tpl:35
-#: plugins/admin/users/headpage.tpl:66
+#: 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:36
-#: plugins/admin/users/headpage.tpl:67
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
 msgid "Regular expression for matching user names"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
@@ -3524,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 ""
@@ -3550,14 +3854,16 @@ msgstr ""
 "использовать шаблоны."
 
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:617
+#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/systems/class_systemManagement.inc:661
 msgid "Template"
 msgstr "Шаблон"
 
-#: plugins/admin/users/template.tpl:46
-#: ihtml/themes/altlinux/setup_introduction.tpl:10
-#: ihtml/themes/altlinux/setup_step2.tpl:16
-#: ihtml/themes/altlinux/setup_step3.tpl:12
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step3.tpl:18
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
@@ -3573,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:434
+#: 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 "
@@ -3612,11 +3960,7 @@ msgstr ""
 msgid "List of users"
 msgstr "Список пользователей"
 
-#: plugins/admin/users/headpage.tpl:16
-msgid "New template"
-msgstr "Создать шаблон"
-
-#: plugins/admin/users/headpage.tpl:30
+#: plugins/admin/users/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to create, edit and delete selected users. Having a "
@@ -3627,84 +3971,59 @@ msgstr ""
 "пользователей. Если у вас достаточно большое количество пользователей, вы "
 "можете использовать групповое выделение."
 
-#: plugins/admin/users/headpage.tpl:33
-#, 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:47
+#: plugins/admin/users/headpage.tpl:38
 msgid "Select to see template pseudo users"
 msgstr "Выберите, чтобы просмотреть шаблоны псевдопользователей"
 
-#: plugins/admin/users/headpage.tpl:47
+#: plugins/admin/users/headpage.tpl:38
 msgid "Show templates"
 msgstr "Показать шаблоны"
 
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/headpage.tpl:39
 msgid "Select to see users that have only a GOsa object"
 msgstr ""
 "Выберите, чтобы просмотреть пользователей, у которых есть только объект GOsa"
 
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/headpage.tpl:39
 msgid "Show functional users"
 msgstr "Показать обычных пользователей"
 
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:40
 msgid "Select to see users that have posix settings"
 msgstr ""
 "Выберите, чтобы просмотреть пользователей с атрибутами в стандарте POSIX"
 
-#: plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:40
 msgid "Show unix users"
 msgstr "Показать UNIX-пользователей"
 
-#: plugins/admin/users/headpage.tpl:50
+#: plugins/admin/users/headpage.tpl:41
 msgid "Select to see users that have mail settings"
 msgstr "Выберите, чтобы просмотреть пользователей с настройками почты"
 
-#: plugins/admin/users/headpage.tpl:50
+#: plugins/admin/users/headpage.tpl:41
 msgid "Show mail users"
 msgstr "Показать пользователей с почтой"
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:42
 msgid "Select to see users that have samba settings"
 msgstr "Выберите, чтобы просмотреть пользователей с настройками Samba"
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:42
 msgid "Show samba users"
 msgstr "Показать пользователей Samba"
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:43
 msgid "Select to see users that have proxy settings"
 msgstr "Выберите, чтобы просмотреть пользователей с настройками прокси-сервера"
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:43
 msgid "Show proxy users"
 msgstr "Показать пользователей с прокси-серверами"
 
-#: plugins/admin/users/headpage.tpl:53
-msgid "Select to see users that have ftp settings"
-msgstr "Выберите, чтобы просмотреть пользователей с настройками FTP"
-
-#: plugins/admin/users/headpage.tpl:53
-msgid "Show FTP users"
-msgstr "Показать пользователей FTP"
-
-#: plugins/admin/users/headpage.tpl:54
-msgid "Select to see users that have FAX settings"
-msgstr "Выберите, чтобы просмотреть пользователей с настройками факсов"
-
-#: plugins/admin/users/headpage.tpl:54
-msgid "Show FAX 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 "Приложение"
 
@@ -3720,6 +4039,7 @@ msgid "Path and/or binary name of application"
 msgstr "Путь и/или имя исполняемого файла приложения"
 
 #: plugins/admin/applications/generic.tpl:18
+#: plugins/gofon/macro/generic.tpl:10
 msgid "Display name"
 msgstr "Отображаемое имя"
 
@@ -3787,6 +4107,7 @@ msgid "Variable"
 msgstr "Переменная"
 
 #: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr "По умолчанию"
 
@@ -3799,7 +4120,7 @@ msgstr "Добавить параметр"
 msgid "Value '%s' specified as option name is not valid."
 msgstr "Значение \"%s\", указанное как имя параметра, некорректно."
 
-#: plugins/admin/applications/remove.tpl:7
+#: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for GOsa to get your data back."
@@ -3812,7 +4133,7 @@ msgstr ""
 msgid "List of applications"
 msgstr "Список приложений"
 
-#: plugins/admin/applications/headpage.tpl:28
+#: plugins/admin/applications/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit and remove selected applications. You may "
@@ -3823,25 +4144,12 @@ msgstr ""
 "приложения. Если у вас достаточно большое количество приложений, вы можете "
 "использовать групповое выделение."
 
-#: plugins/admin/applications/headpage.tpl:31
-#, 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:45
-msgid "Display applications of department"
-msgstr "Приложения в подразделении"
-
-#: plugins/admin/applications/headpage.tpl:51
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Display applications matching"
 msgstr "Шаблон для приложений"
 
-#: plugins/admin/applications/headpage.tpl:52
+#: plugins/admin/applications/headpage.tpl:44
 msgid "Regular expression for matching application names"
 msgstr "Регулярное выражение, соответствующее именам приложений"
 
@@ -3850,46 +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/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:57
+#: 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:146
+#: plugins/admin/applications/class_applicationGeneric.inc:159
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Указанное изображение было загружено некорректно."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:227
+#: 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:232
+#: plugins/admin/applications/class_applicationGeneric.inc:245
 msgid "Required field 'Name' is not filled."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:235
+#: plugins/admin/applications/class_applicationGeneric.inc:248
 msgid "Required field 'Execute' is not filled."
 msgstr "Обязательное поле \"Выполнить\" не заполнено."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:244
+#: 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 "Подразделение"
@@ -3958,7 +4271,7 @@ msgstr ""
 msgid "List of departments"
 msgstr "Список подразделений"
 
-#: plugins/admin/departments/headpage.tpl:28
+#: plugins/admin/departments/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
@@ -3969,26 +4282,12 @@ msgstr ""
 "подразделения. Если у вас достаточно большое количество подразделений, вы "
 "можете использовать групповое выделение."
 
-#: plugins/admin/departments/headpage.tpl:31
-#, 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:51
+#: plugins/admin/departments/headpage.tpl:38
+#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr "Шаблон для подразделений"
 
-#: plugins/admin/departments/headpage.tpl:52
+#: plugins/admin/departments/headpage.tpl:45
 msgid "Regular expression for matching department names"
 msgstr "Регулярное выражение, соответствующее именам подразделений"
 
@@ -3998,67 +4297,101 @@ 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 " Введите другое имя."
 
-#: plugins/admin/systems/class_terminalInfo.inc:61
-#: plugins/admin/systems/class_terminalService.inc:135
+#: plugins/admin/systems/class_terminalInfo.inc:53
+#: plugins/admin/systems/class_terminalInfo.inc:178
+msgid "present"
+msgstr "присутствует"
+
+#: plugins/admin/systems/class_terminalInfo.inc:62
+#: plugins/admin/systems/class_terminalService.inc:136
 #: plugins/admin/systems/class_terminalStartup.inc:75
-#: plugins/admin/systems/class_terminalGeneric.inc:126
+#: plugins/admin/systems/class_terminalGeneric.inc:127
 msgid "This 'dn' has no terminal features."
 msgstr "Это DN не соответствует терминалу."
 
-#: plugins/admin/systems/class_terminalInfo.inc:68
+#: plugins/admin/systems/class_terminalInfo.inc:69
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr "Это виртуальный терминал без особых свойств."
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
+#: plugins/admin/systems/class_terminalInfo.inc:89
 msgid "online"
 msgstr "в сети"
 
-#: plugins/admin/systems/class_terminalInfo.inc:130
+#: plugins/admin/systems/class_terminalInfo.inc:141
 msgid "running"
 msgstr "запущен"
 
-#: plugins/admin/systems/class_terminalInfo.inc:133
+#: plugins/admin/systems/class_terminalInfo.inc:144
 msgid "not running"
 msgstr "не запущен"
 
-#: plugins/admin/systems/class_terminalInfo.inc:141
+#: plugins/admin/systems/class_terminalInfo.inc:152
 msgid "unknown status"
 msgstr "состояние неизвестно"
 
-#: plugins/admin/systems/class_terminalInfo.inc:159
+#: plugins/admin/systems/class_terminalInfo.inc:170
 msgid "offline"
 msgstr "не в сети"
 
@@ -4074,25 +4407,35 @@ msgstr "IP-адрес"
 msgid "MAC-address"
 msgstr "MAC-адрес"
 
-#: plugins/admin/systems/class_winGeneric.inc:85
-#: plugins/admin/systems/class_componentGeneric.inc:47
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
+#: 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:156
-#: plugins/admin/systems/class_componentGeneric.inc:116
+#: 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: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:166
-#: plugins/admin/systems/class_terminalGeneric.inc:234
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_workstationGeneric.inc:241
-#: plugins/admin/systems/class_printGeneric.inc:132
-#: plugins/admin/systems/class_componentGeneric.inc:126
-#: plugins/admin/systems/class_phoneGeneric.inc:129
+#: 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
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr "В выбранной вами ветке уже есть запись \"%s\""
@@ -4203,98 +4546,103 @@ msgstr "Управление системами"
 msgid "Nfs Export"
 msgstr "Экспорт"
 
-#: plugins/admin/systems/servservice.tpl:36
+#: plugins/admin/systems/servservice.tpl:37
 #, fuzzy
 msgid "Time Service"
 msgstr "Сервисы"
 
-#: plugins/admin/systems/servservice.tpl:59
+#: plugins/admin/systems/servservice.tpl:61
 #, fuzzy
 msgid "LDAP Service"
 msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/servservice.tpl:70
+#: plugins/admin/systems/servservice.tpl:72
 #, fuzzy
 msgid "Terminal Service"
 msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/servservice.tpl:77
 #, fuzzy
 msgid "Temporary disable login"
 msgstr "Временно отключить использование факса"
 
-#: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/servservice.tpl:80
 #, fuzzy
 msgid "Font path"
 msgstr "Контакт"
 
-#: plugins/admin/systems/servservice.tpl:91
+#: plugins/admin/systems/servservice.tpl:93
 #, fuzzy
 msgid "Syslog Service"
 msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/servservice.tpl:99
+#: plugins/admin/systems/servservice.tpl:101
 #, fuzzy
 msgid "Print Service"
 msgstr "Служба печати"
 
-#: plugins/admin/systems/class_terminalService.inc:82
+#: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
 msgstr "по умолчанию"
 
-#: plugins/admin/systems/class_terminalService.inc:83
+#: plugins/admin/systems/class_terminalService.inc:84
 msgid "show chooser"
 msgstr "показать окно входа в систему"
 
-#: plugins/admin/systems/class_terminalService.inc:84
+#: plugins/admin/systems/class_terminalService.inc:85
 msgid "direct"
 msgstr "напрямую"
 
-#: plugins/admin/systems/class_terminalService.inc:87
+#: plugins/admin/systems/class_terminalService.inc:88
 msgid "load balanced"
 msgstr "с выравниваем нагрузки"
 
-#: plugins/admin/systems/class_terminalService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:91
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
-#: plugins/admin/systems/class_terminalService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:92
 msgid "ICA client"
 msgstr "Клиент ICA"
 
-#: plugins/admin/systems/class_terminalService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:184
 #, fuzzy
 msgid "Choose the phone located at the current terminal"
 msgstr "Выбрать раздел, для хранения объекта"
 
-#: plugins/admin/systems/class_terminalService.inc:246
-#: plugins/admin/systems/class_terminalService.inc:251
+#: plugins/admin/systems/class_terminalService.inc:248
+#: plugins/admin/systems/class_terminalService.inc:253
 msgid "Please specify a valid VSync range."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/admin/systems/class_terminalService.inc:261
-#: plugins/admin/systems/class_terminalService.inc:266
+#: plugins/admin/systems/class_terminalService.inc:263
+#: plugins/admin/systems/class_terminalService.inc:268
 msgid "Please specify a valid HSync range."
 msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
 
-#: plugins/admin/systems/class_servDB.inc:121
-#: plugins/admin/systems/class_servDB.inc:137
-#: plugins/admin/systems/class_servDB.inc:143
-#: plugins/admin/systems/class_servDB.inc:148
-#: plugins/admin/systems/class_servDB.inc:154
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
 #, fuzzy, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_servDB.inc:127
+#: plugins/admin/systems/class_servDB.inc:137
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:141
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr ""
+
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Имя сервера"
@@ -4332,6 +4680,7 @@ msgstr "Терминал"
 
 #: plugins/admin/systems/terminal.tpl:36
 #: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
 msgid "Mode"
 msgstr "Режим"
 
@@ -4385,97 +4734,102 @@ msgstr "Выберите сервер для синхронизации врем
 msgid "Select action to execute for this terminal"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
 msgstr "текст"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:63
+#: plugins/admin/systems/class_terminalGeneric.inc:64
 #: plugins/admin/systems/class_workstationGeneric.inc:72
 msgid "graphic"
 msgstr "графика"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:88
-#: plugins/admin/systems/class_servGeneric.inc:58
+#: plugins/admin/systems/class_terminalGeneric.inc:89
+#: plugins/admin/systems/class_servGeneric.inc:59
 #: plugins/admin/systems/class_workstationGeneric.inc:98
-#: plugins/admin/ogroups/class_termgroup.inc:51
+#: plugins/admin/ogroups/class_termgroup.inc:59
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "Определение WAKECMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:92
-#: plugins/admin/systems/class_terminalGeneric.inc:104
-#: plugins/admin/systems/class_terminalGeneric.inc:116
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_terminalGeneric.inc:93
+#: plugins/admin/systems/class_terminalGeneric.inc:105
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:63
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_servGeneric.inc:87
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/systems/class_workstationGeneric.inc:114
 #: plugins/admin/systems/class_workstationGeneric.inc:126
-#: plugins/admin/ogroups/class_termgroup.inc:55
-#: plugins/admin/ogroups/class_termgroup.inc:67
-#: plugins/admin/ogroups/class_termgroup.inc:79
+#: plugins/admin/ogroups/class_termgroup.inc:63
+#: plugins/admin/ogroups/class_termgroup.inc:75
+#: plugins/admin/ogroups/class_termgroup.inc:87
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr "Ошибка при выполнении \"%s\"!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:100
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_terminalGeneric.inc:101
+#: plugins/admin/systems/class_servGeneric.inc:71
 #: plugins/admin/systems/class_workstationGeneric.inc:110
-#: plugins/admin/ogroups/class_termgroup.inc:63
+#: plugins/admin/ogroups/class_termgroup.inc:71
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "Определение REBOOTCMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:112
-#: plugins/admin/systems/class_servGeneric.inc:82
+#: plugins/admin/systems/class_terminalGeneric.inc:113
+#: plugins/admin/systems/class_servGeneric.inc:83
 #: plugins/admin/systems/class_workstationGeneric.inc:122
-#: plugins/admin/ogroups/class_termgroup.inc:75
+#: plugins/admin/ogroups/class_termgroup.inc:83
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:142
-#: plugins/admin/systems/class_servGeneric.inc:110
-#: plugins/admin/systems/class_workstationGeneric.inc:151
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: plugins/admin/systems/class_terminalGeneric.inc:144
+#: plugins/admin/systems/class_servGeneric.inc:112
+#: plugins/admin/systems/class_workstationGeneric.inc:152
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Switch off"
 msgstr "Выключить"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:142
-#: plugins/admin/systems/class_servGeneric.inc:110
-#: plugins/admin/systems/class_workstationGeneric.inc:151
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: plugins/admin/systems/class_terminalGeneric.inc:144
+#: plugins/admin/systems/class_servGeneric.inc:112
+#: plugins/admin/systems/class_workstationGeneric.inc:152
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Reboot"
 msgstr "Перезагрузить"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:153
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: plugins/admin/systems/class_terminalGeneric.inc:146
+#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:154
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Wake up"
 msgstr "Вернуть в обычный режим"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:217
+#: plugins/admin/systems/class_terminalGeneric.inc:219
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr "У вас недостаточно прав для создания терминала в этой ветке."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:221
+#: plugins/admin/systems/class_terminalGeneric.inc:223
 msgid "The required field 'Terminal name' is not set."
 msgstr "Обязательное поле 'Название терминала' не заполнено."
 
-#: plugins/admin/systems/class_servGeneric.inc:48
+#: plugins/admin/systems/class_servGeneric.inc:49
 #, fuzzy
 msgid "This 'dn' has no server features."
 msgstr "Этот DN не имеет свойств принтера."
 
-#: plugins/admin/systems/class_servGeneric.inc:168
+#: plugins/admin/systems/class_servGeneric.inc:163
+#, fuzzy
+msgid "The required field 'Server name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
+
+#: plugins/admin/systems/class_servGeneric.inc:170
 #, fuzzy
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/admin/systems/class_servDHCP.inc:32
+#: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "Удалить сервис DHCP"
 
-#: plugins/admin/systems/class_servDHCP.inc:33
+#: plugins/admin/systems/class_servDHCP.inc:34
 #, fuzzy
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
@@ -4484,11 +4838,11 @@ msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servDHCP.inc:35
+#: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Add DHCP service"
 msgstr "Добавить сервис DHCP"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
+#: plugins/admin/systems/class_servDHCP.inc:37
 #, fuzzy
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
@@ -4509,106 +4863,223 @@ msgstr "URL принтера"
 msgid "Path to PPD"
 msgstr "Путь к PPD"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:136
+msgid "This 'dn' has no workstation features."
+msgstr "Это DN не содержит атрибутоов рабочей станции."
+
+#: plugins/admin/systems/class_workstationGeneric.inc:225
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
+
+#: plugins/admin/systems/class_workstationGeneric.inc:229
+msgid "The required field 'Workstation name' is not set."
+msgstr "Обязательное поле 'Название рабочей станции' не заполнено."
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 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:642
-msgid "New terminal"
-msgstr "Создать терминал"
-
-#: plugins/admin/systems/class_systemManagement.inc:645
-msgid "New workstation"
-msgstr "Новая рабочая станция"
+#: plugins/admin/systems/class_systemManagement.inc:538
+msgid "Create new system"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:661
-msgid "Thin client template for"
-msgstr "Шаблон тонкого клиента для"
+#: plugins/admin/systems/class_systemManagement.inc:546
+#, fuzzy
+msgid "Edit system"
+msgstr "Список систем"
 
-#: plugins/admin/systems/class_systemManagement.inc:673
-msgid "Workstation template for"
-msgstr "Шаблон рабочей станции для"
+#: plugins/admin/systems/class_systemManagement.inc:547
+#, fuzzy
+msgid "Delete system"
+msgstr "Удалить"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:136
-msgid "This 'dn' has no workstation features."
-msgstr "Это DN не содержит атрибутоов рабочей станции."
+#: plugins/admin/systems/class_systemManagement.inc:553
+#, fuzzy
+msgid "System"
+msgstr "Системы"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:224
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
+#: plugins/admin/systems/class_systemManagement.inc:557
+msgid "This table displays all systems, in the selected tree."
+msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "The required field 'Workstation name' is not set."
-msgstr "Обязательное поле 'Название рабочей станции' не заполнено."
+#: plugins/admin/systems/class_systemManagement.inc:577
+#, fuzzy
+msgid "Cups Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/class_printGeneric.inc:56
-msgid "This 'dn' has no printer features."
-msgstr "Этот DN не имеет свойств принтера."
+#: plugins/admin/systems/class_systemManagement.inc:578
+msgid "Log Db"
+msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:122
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr "У вас недостаточно прав для создания принтера в этой ветке."
+#: plugins/admin/systems/class_systemManagement.inc:579
+#, fuzzy
+msgid "Syslog Server"
+msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/class_servDNS.inc:32
-msgid "Remove DNS service"
-msgstr "Удалить сервис DNS"
+#: plugins/admin/systems/class_systemManagement.inc:580
+#, fuzzy
+msgid "Mail Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/class_servDNS.inc:33
+#: plugins/admin/systems/class_systemManagement.inc:581
 #, fuzzy
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+msgid "Imap Server"
+msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/class_servDNS.inc:35
-msgid "Add DNS service"
-msgstr "Добавить сервис DNS"
+#: plugins/admin/systems/class_systemManagement.inc:582
+#, fuzzy
+msgid "Nfs Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/class_servDNS.inc:36
+#: plugins/admin/systems/class_systemManagement.inc:583
 #, fuzzy
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Kerberos Server"
+msgstr "Kerberos"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Шаблон рабочей станции"
+#: plugins/admin/systems/class_systemManagement.inc:584
+#, fuzzy
+msgid "Asterisk Server"
+msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Имя рабочий станции"
+#: plugins/admin/systems/class_systemManagement.inc:585
+#, fuzzy
+msgid "Fax Server"
+msgstr "Сервер"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:586
+#, fuzzy
+msgid "Ldap Server"
+msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/servdb.tpl:10
+#: 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:858
+msgid "New workstation"
+msgstr "Новая рабочая станция"
+
+#: plugins/admin/systems/class_systemManagement.inc:875
+#, fuzzy
+msgid "Terminal template for"
+msgstr "Шаблон терминала"
+
+#: plugins/admin/systems/class_systemManagement.inc:886
+msgid "Workstation template for"
+msgstr "Шаблон рабочей станции для"
+
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr "Этот DN не имеет свойств принтера."
+
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr "У вас недостаточно прав для создания принтера в этой ветке."
+
+#: plugins/admin/systems/class_servDNS.inc:33
+msgid "Remove DNS service"
+msgstr "Удалить сервис DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:34
+#, fuzzy
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_servDNS.inc:36
+msgid "Add DNS service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:37
+#, fuzzy
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Шаблон рабочей станции"
+
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Имя рабочий станции"
+
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:10
 #, fuzzy
 msgid "Kerberos Realm"
 msgstr "Kerberos"
@@ -4673,6 +5144,155 @@ msgstr "база пользователя"
 msgid "Logging DB user"
 msgstr ""
 
+#: plugins/admin/systems/class_servKolab.inc:112
+#, fuzzy
+msgid "Remove Kolab extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_servKolab.inc:112
+#, fuzzy
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_servKolab.inc:115
+#, fuzzy
+msgid "Add Kolab service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_servKolab.inc:115
+#, fuzzy
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: 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:149
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
+msgstr ""
+
+#: 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:227
+msgid "The given Quota settings value must be a number."
+msgstr ""
+
+#: 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:231
+msgid "Future days must be a value."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:239
+msgid "No SMTP smarthost/relayhost set."
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:14
+#, fuzzy
+msgid "POP3 service"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/servkolab.tpl:22
+#, fuzzy
+msgid "POP3/SSL service"
+msgstr "Служба SSH"
+
+#: plugins/admin/systems/servkolab.tpl:30
+#, fuzzy
+msgid "IMAP service"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/servkolab.tpl:38
+#, fuzzy
+msgid "IMAP/SSL service"
+msgstr "Служба SSH"
+
+#: plugins/admin/systems/servkolab.tpl:46
+#, fuzzy
+msgid "Sieve service"
+msgstr "Служба SSH"
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:81
+#, fuzzy
+msgid "Quota settings"
+msgstr "Настройки Samba"
+
+#: plugins/admin/systems/servkolab.tpl:97
+#, fuzzy
+msgid "Free/Busy settings"
+msgstr "Настройки факса"
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: 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:144
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
+
 #: plugins/admin/systems/wingeneric.tpl:6
 #, fuzzy
 msgid "Machine name"
@@ -4692,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 "
@@ -4702,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/ogroups/ogroup_objects.tpl:33
+#: 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/ogroups/ogroup_objects.tpl:33
+#: 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/ogroups/ogroup_objects.tpl:35
+#: 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/ogroups/ogroup_objects.tpl:34
+#: 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/ogroups/ogroup_objects.tpl:37
+#: 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:62
+#: plugins/admin/systems/headpage.tpl:54
 msgid "Regular expression for matching system names"
 msgstr "Регулярное выражение, соответствующее именам систем"
 
-#: plugins/admin/systems/headpage.tpl:65
+#: plugins/admin/systems/headpage.tpl:62
 msgid "Display terminal(s) of user"
 msgstr "Показать терминал(ы) пользователя"
 
-#: plugins/admin/systems/headpage.tpl:66
+#: plugins/admin/systems/headpage.tpl:65
 msgid "User name of which terminal(s) are shown"
 msgstr "Имя пользователя, для которого перечисляются терминалы"
 
@@ -4833,12 +5444,13 @@ msgid "Choose mouse port"
 msgstr "Выберите порт мыши"
 
 #: plugins/admin/systems/service.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:5
+#: plugins/gofon/phoneaccount/generic.tpl:22
 msgid "Telephone hardware"
 msgstr "Телефонное оборудование"
 
 #: plugins/admin/systems/service.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:9
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/generic.tpl:26
 msgid "Telephone"
 msgstr "Телефон"
 
@@ -4950,107 +5562,34 @@ msgstr "Предоставлять службу сканирования"
 msgid "Select scanner driver to use"
 msgstr "Выберите драйвер для используемого сканера"
 
-#: plugins/admin/systems/startup.tpl:1
-msgid "Boot parameters"
-msgstr "Параметры загрузки"
-
-#: plugins/admin/systems/startup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP-сервер"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
+"В полях ниже вы можете изменить пароль суперпользователя для выбранного "
+"терминала. Изменения вступят в силу после следующей перезагрузки. "
+"Пожалуйста, запомните новый пароль, так как иначе вы не сможете войти в "
+"систему. <b>Оставьте поля пустыми, если хотите использовать значение по "
+"умолчанию.</b>"
 
-#: plugins/admin/systems/startup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е LDAP-Ñ\81еÑ\80веÑ\80 длÑ\8f Ñ\83пÑ\80авлениÑ\8f Ñ\83Ñ\87еÑ\82нÑ\8bми запиÑ\81Ñ\8fми и Ñ\82еÑ\80миналами"
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
+msgstr "Ð\98зменение паÑ\80олÑ\8f влиÑ\8fеÑ\82 Ñ\82олÑ\8cко на аÑ\83Ñ\82енÑ\82иÑ\84икаÑ\86иÑ\8e в Ñ\81иÑ\81Ñ\82еме."
 
-#: plugins/admin/systems/startup.tpl:16
-msgid "Boot kernel"
-msgstr "Ядро для загрузки"
-
-#: plugins/admin/systems/startup.tpl:18
-msgid "Enter the filename of the kernel to use"
-msgstr "Введите имя файла загружаемого ядра"
-
-#: plugins/admin/systems/startup.tpl:21
-msgid "Custom options"
-msgstr "Дополнительные параметры"
-
-#: plugins/admin/systems/startup.tpl:23
-msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
-msgstr ""
-"Введите любые дополнительные параметры, которые должны передаваться ядру во "
-"время загрузки"
-
-#: plugins/admin/systems/startup.tpl:34
-msgid "Select if terminal supports graphical startup with progress bar"
-msgstr ""
-"Выберите, должен ли терминал подерживать загрузку в графическом режиме с "
-"показом индикатора состояния"
-
-#: plugins/admin/systems/startup.tpl:35
-msgid "use graphical bootup"
-msgstr "Загружать в графическом режиме"
-
-#: plugins/admin/systems/startup.tpl:37
-msgid "Select if terminal should boot in text mode"
-msgstr "Выберите, должен ли терминал загружаться в текстовом режиме"
-
-#: plugins/admin/systems/startup.tpl:38
-msgid "use standard linux textual bootup"
-msgstr "Загружать в стандартном текстовом режиме"
-
-#: plugins/admin/systems/startup.tpl:40
-msgid "Select to get more verbose output during startup"
-msgstr ""
-"Выберите, нужно ли использовать подробный вывод информации при загрузке"
-
-#: plugins/admin/systems/startup.tpl:41
-msgid "use debug mode for startup"
-msgstr "Используйте отладочный режим"
-
-#: plugins/admin/systems/startup.tpl:52
-msgid "Kernel modules (format: name parameters)"
-msgstr "Модули ядра (формат: имя параметры)"
-
-#: plugins/admin/systems/startup.tpl:54
-msgid "Add additional modules to load on startup"
-msgstr ""
-"Укажите дополнительные модули, которые должны загружаться при запуске системы"
-
-#: plugins/admin/systems/startup.tpl:65
-msgid "Automount devices (format: complete autofs entry)"
-msgstr "Автоматически монтируемые устройства (формат: полная запись autofs)"
-
-#: plugins/admin/systems/startup.tpl:67
-msgid "Add additional automount entries"
-msgstr "Укажите дополнительные устройства для автоматического монтирования"
-
-#: plugins/admin/systems/startup.tpl:84
-msgid "Additional fstab entries"
-msgstr "Дополнительные записи в fstab"
-
-#: plugins/admin/systems/startup.tpl:86
-msgid "Add additional filesystems to be mounted during startup"
-msgstr ""
-"Укажите дополнительные файловые системы для монтирования во время загрузки"
-
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-"В полях ниже вы можете изменить пароль суперпользователя для выбранного "
-"терминала. Изменения вступят в силу после следующей перезагрузки. "
-"Пожалуйста, запомните новый пароль, так как иначе вы не сможете войти в "
-"систему. <b>Оставьте поля пустыми, если хотите использовать значение по "
-"умолчанию.</b>"
+#: 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/password.tpl:6
-msgid "Changing the password impinges on authentification only."
-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
@@ -5105,157 +5644,218 @@ msgstr "Прочие сетевые компоненты"
 msgid "Create"
 msgstr "Создать"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:47
-msgid "This 'dn' has no phone features."
-msgstr "ЭÑ\82оÑ\82 DN не имееÑ\82 Ñ\81войÑ\81Ñ\82в Ñ\82елеÑ\84она."
+#: plugins/admin/systems/startup.tpl:1
+msgid "Boot parameters"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b загÑ\80Ñ\83зки"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:119
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
+#: plugins/admin/systems/startup.tpl:8
+msgid "LDAP server"
+msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/class_servKolab.inc:145
-#, fuzzy
-msgid "Remove Kolab extension"
-msgstr "Удалить параметры"
+#: plugins/admin/systems/startup.tpl:10
+msgid "Choose LDAP server to use for accounts and terminal management"
+msgstr "Выберите LDAP-сервер для управления учетными записями и терминалами"
 
-#: plugins/admin/systems/class_servKolab.inc:145
-#, fuzzy
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+#: plugins/admin/systems/startup.tpl:17
+msgid "Boot kernel"
+msgstr "Ядро для загрузки"
 
-#: plugins/admin/systems/class_servKolab.inc:148
-#, fuzzy
-msgid "Add Kolab service"
-msgstr "Добавить сервис DNS"
+#: plugins/admin/systems/startup.tpl:19
+msgid "Enter the filename of the kernel to use"
+msgstr "Введите имя файла загружаемого ядра"
 
-#: plugins/admin/systems/class_servKolab.inc:148
-#, fuzzy
+#: plugins/admin/systems/startup.tpl:22
+msgid "Custom options"
+msgstr "Дополнительные параметры"
+
+#: plugins/admin/systems/startup.tpl:24
 msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
 msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+"Введите любые дополнительные параметры, которые должны передаваться ядру во "
+"вÑ\80емÑ\8f загÑ\80Ñ\83зки"
 
-#: plugins/admin/systems/class_servKolab.inc:167
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+#: plugins/admin/systems/startup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
+"Выберите, должен ли терминал подерживать загрузку в графическом режиме с "
+"показом индикатора состояния"
 
-#: plugins/admin/systems/class_servKolab.inc:173
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
+#: plugins/admin/systems/startup.tpl:36
+msgid "use graphical bootup"
+msgstr "Загружать в графическом режиме"
 
-#: plugins/admin/systems/class_servKolab.inc:197
-msgid "Future days in Free/Busy settings must be set."
-msgstr ""
+#: plugins/admin/systems/startup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Выберите, должен ли терминал загружаться в текстовом режиме"
 
-#: plugins/admin/systems/class_servKolab.inc:199
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
+#: plugins/admin/systems/startup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Загружать в стандартном текстовом режиме"
 
-#: plugins/admin/systems/class_servKolab.inc:203
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/startup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
+"Выберите, нужно ли использовать подробный вывод информации при загрузке"
 
-#: plugins/admin/systems/class_servKolab.inc:205
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr ""
+#: plugins/admin/systems/startup.tpl:42
+msgid "use debug mode for startup"
+msgstr "Используйте отладочный режим"
 
-#: plugins/admin/systems/class_servKolab.inc:207
-msgid "Future days must be a value."
-msgstr ""
+#: plugins/admin/systems/startup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Модули ядра (формат: имя параметры)"
 
-#: plugins/admin/systems/class_servKolab.inc:212
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/startup.tpl:55
+msgid "Add additional modules to load on startup"
 msgstr ""
+"Укажите дополнительные модули, которые должны загружаться при запуске системы"
 
-#: plugins/admin/systems/class_servKolab.inc:217
-msgid "No SMTP smarthost/relayhost set."
+#: plugins/admin/systems/startup.tpl:67
+msgid "Automount devices (format: complete autofs entry)"
+msgstr "Автоматически монтируемые устройства (формат: полная запись autofs)"
+
+#: plugins/admin/systems/startup.tpl:69
+msgid "Add additional automount entries"
+msgstr "Укажите дополнительные устройства для автоматического монтирования"
+
+#: plugins/admin/systems/startup.tpl:87
+msgid "Additional fstab entries"
+msgstr "Дополнительные записи в fstab"
+
+#: plugins/admin/systems/startup.tpl:89
+msgid "Add additional filesystems to be mounted during startup"
 msgstr ""
+"Укажите дополнительные файловые системы для монтирования во время загрузки"
 
-#: plugins/admin/systems/servkolab.tpl:14
-#, fuzzy
-msgid "POP3 service"
-msgstr "Служба печати"
+#: plugins/admin/systems/class_phoneGeneric.inc:104
+msgid "This 'dn' has no phone features."
+msgstr "Этот DN не имеет свойств телефона."
 
-#: plugins/admin/systems/servkolab.tpl:22
+#: plugins/admin/systems/class_phoneGeneric.inc:176
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:366
 #, fuzzy
-msgid "POP3/SSL service"
-msgstr "СлÑ\83жба SSH"
+msgid "yes"
+msgstr "СиÑ\81Ñ\82емÑ\8b"
 
-#: plugins/admin/systems/servkolab.tpl:30
+#: plugins/admin/systems/class_phoneGeneric.inc:176
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:367
 #, fuzzy
-msgid "IMAP service"
-msgstr "LDAP-сервер"
+msgid "no"
+msgstr "нет"
 
-#: plugins/admin/systems/servkolab.tpl:38
+#: plugins/admin/systems/class_phoneGeneric.inc:197
+msgid "dynamic"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:197
 #, fuzzy
-msgid "IMAP/SSL service"
-msgstr "СлÑ\83жба SSH"
+msgid "Networksettings"
+msgstr "СеÑ\82евÑ\8bе наÑ\81Ñ\82Ñ\80ойки"
 
-#: plugins/admin/systems/servkolab.tpl:46
+#: plugins/admin/systems/class_phoneGeneric.inc:263
 #, fuzzy
-msgid "Sieve service"
-msgstr "СлÑ\83жба SSH"
+msgid "The required field 'Phone name' is not set."
+msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9bиÑ\87ное имÑ\8f\" не заполнено."
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/class_phoneGeneric.inc:266
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/class_phoneGeneric.inc:275
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:282
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
-#: plugins/admin/systems/servkolab.tpl:81
+#: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
-msgid "Quota settings"
-msgstr "Настройки Samba"
+msgid "Specific Phone settings"
+msgstr "Настройки телефона"
 
-#: plugins/admin/systems/servkolab.tpl:97
+#: plugins/admin/systems/phonesettings.tpl:9
 #, fuzzy
-msgid "Free/Busy settings"
-msgstr "Настройки факса"
+msgid "Phone type"
+msgstr "Название"
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+#, fuzzy
+msgid "Choose a phone type"
+msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:64
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/systems/phonesettings.tpl:35
+#, fuzzy
+msgid "DTMF mode"
+msgstr "Режим"
+
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+#, fuzzy
+msgid "Default IP"
+msgstr "по умолчанию"
+
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:136
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/phonesettings.tpl:80
+#, fuzzy
+msgid "Modus"
+msgstr "Мышь"
+
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:142
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/phonesettings.tpl:121
+#, fuzzy
+msgid "Secret"
+msgstr "Улица"
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:147
-msgid "Host used to relay mails"
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:161
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/phonesettings.tpl:150
+#, fuzzy
+msgid "Account code"
+msgstr "Учетная запись"
+
+#: plugins/admin/systems/phonesettings.tpl:158
+#, fuzzy
+msgid "Trunk lines"
+msgstr "Тонкие клиенты"
+
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:167
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/phonesettings.tpl:188
+#, fuzzy
+msgid "Hosts that are not allowed to connect"
+msgstr "У вас недостаточно прав для удаления этого объекта!"
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:19
@@ -5266,67 +5866,67 @@ msgstr "Терминалы"
 msgid "Select objects to add"
 msgstr "Выбрать объекты для добавления"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Выберите подразделение"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Show departments"
 msgstr "Показать подразделения"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
 msgid "Select to see GOsa accounts"
 msgstr "Выберите чтобы посмотреть пользователей GOsa"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
 msgid "Show people"
 msgstr "Показать людей"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
 msgid "Select to see GOsa groups"
 msgstr "Выберите чтобы посмотреть группы GOsa"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
 msgid "Show groups"
 msgstr "Показать группы"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
 msgid "Select to see applications"
 msgstr "Выберите чтобы посмотреть приложения"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
 msgid "Show applications"
 msgstr "Показать приложения"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Select to see workstations"
 msgstr "Выберите чтобы посмотреть рабочие станции"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to see terminals"
 msgstr "Выберите чтобы посмотреть терминалы"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
 msgid "Select to see printers"
 msgstr "Выберите чтобы посмотреть принтеры"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
 msgid "Show printers"
 msgstr "Показать принтеры"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Select to see phones"
 msgstr "Выберите чтобы посмотреть телефоны"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
 msgid "Display objects of department"
 msgstr "Показать объекты подразделения"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:46
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects matching"
 msgstr "Показать совпадения объектов"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:47
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Regular expression for matching object names"
 msgstr "Регулярное выражение, соответствующее именам объектов"
 
@@ -5342,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 ""
 "Вы можете комбинировать не более двух различных классов в одном объекте!"
@@ -5424,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:153
+#: 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:159
-#: plugins/admin/ogroups/class_ogroupManagement.inc:185
+#: 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 "Название группы"
@@ -5455,7 +6070,7 @@ msgstr ""
 "Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
 "сможет восстановить эти данные."
 
-#: plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/headpage.tpl:24
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit or remove selected groups. You may want to "
@@ -5466,55 +6081,117 @@ msgstr ""
 "группы пользователей. Если у вас их достаточно большое количество, вы можете "
 "использовать групповое выделение."
 
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show empty groups"
-msgstr "Показать пустые группы"
-
-#: plugins/admin/ogroups/headpage.tpl:47
+#: plugins/admin/ogroups/headpage.tpl:39
 msgid "Show groups containing users"
 msgstr "Показать группы с пользователями"
 
-#: plugins/admin/ogroups/headpage.tpl:48
+#: plugins/admin/ogroups/headpage.tpl:40
 msgid "Show groups containing groups"
 msgstr "Показать группы с группами"
 
-#: plugins/admin/ogroups/headpage.tpl:49
+#: plugins/admin/ogroups/headpage.tpl:41
 msgid "Show groups containing applications"
 msgstr "Показать группы с приложениями"
 
-#: plugins/admin/ogroups/headpage.tpl:50
+#: plugins/admin/ogroups/headpage.tpl:42
 msgid "Show groups containing departments"
 msgstr "Показать группы с подразделениями"
 
-#: plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/ogroups/headpage.tpl:43
 msgid "Show groups containing servers"
 msgstr "Показать группы с серверами"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:44
 msgid "Show groups containing workstations"
 msgstr "Показать группы с рабочими станциями"
 
-#: plugins/admin/ogroups/headpage.tpl:53
+#: plugins/admin/ogroups/headpage.tpl:45
 msgid "Show groups containing terminals"
 msgstr "Показать группы с терминалами"
 
-#: plugins/admin/ogroups/headpage.tpl:54
+#: 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 ""
+
+#: plugins/admin/ogroups/mail.tpl:11
+#, fuzzy
+msgid "Primary mail address for this distribution list"
+msgstr "Основной адрес эл. почты для этой общей папки"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+#, fuzzy
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+#, fuzzy
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
+
 #: plugins/gofon/phoneaccount/main.inc:120
 msgid "Phone settings"
 msgstr "Настройки телефона"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:114
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
+#, fuzzy
+msgid "no macro"
+msgstr "Телефонные отчеты"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
+#, fuzzy
+msgid "undefined"
+msgstr "не определена"
+
+#: 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:538
 msgid "This account has no phone extensions."
 msgstr "В этой учетной записи нет атрибутов для телефона."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:124
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:548
 msgid "Remove phone account"
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:125
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:549
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -5522,11 +6199,11 @@ msgstr ""
 "В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
 "щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:127
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:551
 msgid "Create phone account"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:128
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:552
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -5534,54 +6211,78 @@ msgstr ""
 "В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
 "щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:140
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:564
 msgid "Please enter a valid phone number!"
 msgstr "Введите корректный номер телефона!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:176
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:602
 msgid "Choose your private phone"
 msgstr "Укажите личный телефон"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:287
+#: 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:301
+#: 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:725
+#, php-format
+msgid "The given PIN is too short"
+msgstr ""
+
+#: 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:304
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:743
 #, php-format
 msgid "The timeout '%s' contains invalid characters!"
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/gofon/phoneaccount/generic.tpl:16
-msgid "Answering machine"
-msgstr "Автоответчик"
+#: 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/generic.tpl:22
-#: plugins/gofon/phoneaccount/generic.tpl:25
-msgid "Deliver missed calls as mail"
-msgstr "Сообщать о пропущеных звонка по почте"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:902
+msgid "Stop"
+msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:39
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
 msgid "Phone numbers"
 msgstr "Телефонные номера"
 
-#: plugins/gofon/phoneaccount/generic.tpl:55
+#: plugins/gofon/phoneaccount/generic.tpl:38
 msgid "Forward calls to"
 msgstr "Перенаправлять звонки на"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:42
 msgid "Phone number"
 msgstr "Номер телефона"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:42
 msgid "Timeout (s)"
 msgstr "Таймаут (с)"
 
+#: plugins/gofon/phoneaccount/generic.tpl:57
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#, fuzzy
+msgid "Phone macro"
+msgstr "Телефонные отчеты"
+
+#: plugins/gofon/phoneaccount/generic.tpl:75
+#, fuzzy
+msgid "Phone PIN"
+msgstr "Телефон"
+
 #: plugins/gofon/reports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Телефонные отчеты"
@@ -5610,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 "Продолжительность"
@@ -5623,26 +6319,217 @@ msgstr "Продолжительность"
 msgid "Phone reports"
 msgstr "Телефонные отчеты"
 
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Группа"
+#: 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: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: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: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"
+msgstr "Название"
+
+#: plugins/gofon/macro/generic.tpl:12
+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"
+msgstr "Список пользователей"
+
+#: plugins/gofon/macro/generic.tpl:52
+#, fuzzy
+msgid "Macro text"
+msgstr "Название"
+
+#: plugins/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "Список групп"
+
+#: plugins/gofon/macro/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"группы пользователей. Если у вас их достаточно большое количество, вы можете "
+"использовать групповое выделение."
+
+#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
+#, fuzzy
+msgid "Display macros  matching"
+msgstr "Шаблон для групп"
+
+#: plugins/gofon/macro/headpage.tpl:44
+#, fuzzy
+msgid "Regular expression for matching macro names"
+msgstr "Регулярное выражение, соответствующее именам групп"
+
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#, fuzzy
+msgid "Phone macro management"
+msgstr "Управление системами"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:233
+#, fuzzy
+msgid "String"
+msgstr "в течение"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:234
+msgid "Combobox"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:235
+msgid "Bool"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+#, fuzzy
+msgid "Delete unused"
+msgstr "Удалить"
+
+#: 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:328
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Phone macros"
+msgstr "Телефонные отчеты"
+
+#: 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: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"
+msgstr "подразделения"
+
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+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 "Имя объекта"
 
+#: plugins/generic/references/contents.tpl:11
+#, fuzzy
+msgid "Contents"
+msgstr "Контакт"
+
 #: plugins/generic/references/contents.tpl:18
 msgid "This object has no relationship to other objects."
 msgstr "Данный объект не имеет ссылок на другие объекты"
@@ -5675,28 +6562,80 @@ msgstr "Команда разработчиков GOsa"
 msgid "Welcome %s!"
 msgstr "Добро пожаловать %s!"
 
-#: include/functions.inc:267
+#: include/php_setup.inc:71
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
+msgstr ""
+
+#: include/php_setup.inc:71 html/main.php:292
+#, fuzzy
+msgid "Toggle information"
+msgstr "Личная информация"
+
+#: include/php_setup.inc:76
+#, fuzzy
+msgid "PHP error"
+msgstr "Ошибка LDAP:"
+
+#: include/php_setup.inc:87
+msgid "class"
+msgstr ""
+
+#: include/php_setup.inc:93
+#, fuzzy
+msgid "function"
+msgstr "Действие"
+
+#: include/php_setup.inc:98
+#, fuzzy
+msgid "static"
+msgstr "Состояние"
+
+#: include/php_setup.inc:102
+#, fuzzy
+msgid "method"
+msgstr "Почтовые настройки"
+
+#: include/php_setup.inc:121
+msgid "Trace"
+msgstr ""
+
+#: include/php_setup.inc:122
+#, fuzzy
+msgid "File"
+msgstr "Файлы"
+
+#: include/php_setup.inc:122
+#, fuzzy
+msgid "Line"
+msgstr "в"
+
+#: include/php_setup.inc:123
+#, fuzzy
+msgid "Arguments"
+msgstr "подразделения"
+
+#: include/functions.inc:272
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:288
+#: include/functions.inc:293
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:308
+#: include/functions.inc:312
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:346
+#: include/functions.inc:350
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr "Ошибка при создании блокировки. Заданные параметры некорректны."
 
-#: include/functions.inc:356
+#: include/functions.inc:360
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -5705,24 +6644,24 @@ msgstr ""
 "Не удается создать блокировку в базе данных LDAP. Проверьте, раздел config в "
 "файле gosa.conf! Ответ сервера: %s"
 
-#: include/functions.inc:371
+#: include/functions.inc:375
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr "Ошибка при создании блокировки. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:397
+#: include/functions.inc:401
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr "Ошибка при удалении блокировки. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:427
+#: 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:437
+#: include/functions.inc:441
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -5730,7 +6669,7 @@ msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
 "\" в файле gosa.conf!"
 
-#: include/functions.inc:445
+#: include/functions.inc:449
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -5738,12 +6677,12 @@ msgstr ""
 "Для блокируемого объекта обнаружено несколько блокировок. Этого быть не "
 "должно, проверьте работу LDAP."
 
-#: include/functions.inc:517
+#: include/functions.inc:563
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:519
+#: include/functions.inc:565
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -5752,89 +6691,43 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:531
-msgid "Configure"
-msgstr "Настроить"
-
-#: include/functions.inc:536
-msgid "incomplete"
-msgstr "не полный"
-
-#: include/functions.inc:919
-#, php-format
-msgid ""
-"You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
-"Please contact the person in order to clarify proceedings."
-msgstr ""
-"Вы собираетесь редактировать запись LDAP \"%s\", которая используется \"%s"
-"\". Пожалуйста, обратитесь к пользователю и уточните отношения."
-
-#: include/functions.inc:1018
-msgid "LDAP error:"
-msgstr "Ошибка LDAP:"
-
-#: include/functions.inc:1460
-msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
-
-#: include/functions.inc:1505
-#, php-format
-msgid "GOsa development snapshot (Rev %s)"
-msgstr ""
-
-#: include/functions.inc:1540
-msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-
-#: include/functions.inc:1540
-#, fuzzy
-msgid "Toggle information"
-msgstr "Личная информация"
-
-#: include/functions.inc:1548
-#, fuzzy
-msgid "PHP error"
-msgstr "Ошибка LDAP:"
-
-#: include/functions.inc:1555
-msgid "class"
-msgstr ""
-
-#: include/functions.inc:1561
-#, fuzzy
-msgid "function"
-msgstr "Действие"
-
-#: include/functions.inc:1566
-#, fuzzy
-msgid "static"
-msgstr "Состояние"
+#: include/functions.inc:577
+msgid "Configure"
+msgstr "Настроить"
 
-#: include/functions.inc:1570
-#, fuzzy
-msgid "method"
-msgstr "Почтовые настройки"
+#: include/functions.inc:582
+msgid "incomplete"
+msgstr "не полный"
 
-#: include/functions.inc:1587
-msgid "Trace"
+#: include/functions.inc:981
+#, php-format
+msgid ""
+"You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
+"Please contact the person in order to clarify proceedings."
 msgstr ""
+"Вы собираетесь редактировать запись LDAP \"%s\", которая используется \"%s"
+"\". Пожалуйста, обратитесь к пользователю и уточните отношения."
 
-#: include/functions.inc:1588
-#, fuzzy
-msgid "File"
-msgstr "Файлы"
+#: include/functions.inc:1080
+msgid "LDAP error:"
+msgstr "Ошибка LDAP:"
 
-#: include/functions.inc:1588
-#, fuzzy
-msgid "Line"
-msgstr "в"
+#: include/functions.inc:1534
+msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:1589
-#, fuzzy
-msgid "Arguments"
-msgstr "подразделения"
+#: include/functions.inc:1577
+#, php-format
+msgid "GOsa development snapshot (Rev %s)"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:39
+msgid ""
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
+msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:43
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
@@ -5842,50 +6735,50 @@ msgstr ""
 "Предупреждение: не удается получить доступ к серверу IMAP! Некоторые "
 "почтовые настройки не будут сохранены."
 
-#: include/class_mail-methods-cyrus.inc:106
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:122
+#: include/class_mail-methods-cyrus.inc:131
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr "Не удается создать квоту IMAP. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:133
-msgid ""
-"Warning: imap_getacl is not implemented, wouldn't modify acl informations."
+#: include/class_mail-methods-cyrus.inc:155
+#, fuzzy
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 "Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
 "права доступа к общим папкам."
 
-#: include/class_mail-methods-cyrus.inc:168
+#: include/class_mail-methods-cyrus.inc:173
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 "Предупреждение: функция imap_getacl недоступна, не удается считать права на "
 "доступ к папкам!"
 
-#: include/class_mail-methods-cyrus.inc:190
+#: include/class_mail-methods-cyrus.inc:195
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
 
-#: include/class_mail-methods-cyrus.inc:218
+#: include/class_mail-methods-cyrus.inc:223
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr "Невозможно зарегистрироваться на сервере SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:231
+#: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr "Невозможно получить сценарий SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:302
+#: include/class_mail-methods-cyrus.inc:307
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr "Невозможно отправить сценарий SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:306
+#: include/class_mail-methods-cyrus.inc:311
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%s\"."
@@ -5907,15 +6800,155 @@ msgid ""
 msgstr ""
 "Вы сейчас редактируете объект базы данных. Хотите отказаться от изменений?"
 
-#: include/setup_checks.inc:68
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr "Для этого DN нет расширений учетной записи."
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Это пустой модуль."
+
+#: 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: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:448
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr "Ошибка XML в gosa.conf: %s в строке %d"
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+"Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
+"администратору."
+
+#: include/class_config.inc:431
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: 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:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+"Параметр SMBHASH в gosa.conf некорректен! Не удается сменить пароль Samba."
+
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Предупреждение: не удается создать пароль Kerberos. В вашей установке PHP "
+"нет поддержки Kerberos, пароль не был изменен."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "Ошибка подключения к базе данных Kerberos!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr "Ошибка смены пароля в базе данных Kerberos!"
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_ldap.inc:438
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
+"об этом команде разработчиков GOsa."
+
+#: 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:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr ""
+
+#: include/class_certificate.inc:192
+#, fuzzy
+msgid "Can't create/open File"
+msgstr "Невозможно импортиовать пустой файл"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr ""
+
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr ""
+
+#: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr "Не удается начать сеанс на LDAP-сервере. Проверка схем невозможна!"
 
-#: include/setup_checks.inc:77 include/setup_checks.inc:86
+#: include/functions_setup.inc:107 include/functions_setup.inc:116
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr "Не удается получить информацию о схемах. Проверка схем невозможна!"
 
-#: include/setup_checks.inc:106
+#: include/functions_setup.inc:136
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -5924,7 +6957,7 @@ msgstr ""
 "Необязательный класс объектов \"%s\", нужный для модуля \"%s\", отсутствует "
 "в установке LDAP."
 
-#: include/setup_checks.inc:110
+#: include/functions_setup.inc:140
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -5932,108 +6965,108 @@ msgstr ""
 "У необязательного класса объектов \"%s\", нужного для модуля \"%s\", версия "
 "не %s"
 
-#: include/setup_checks.inc:114
+#: include/functions_setup.inc:145
 #, fuzzy, php-format
 msgid "Support for '%s' enabled"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
-#: include/setup_checks.inc:124
+#: include/functions_setup.inc:155
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr "Обязательный класс объектов \"%s\" отсутствует в установке LDAP."
 
-#: include/setup_checks.inc:128
+#: include/functions_setup.inc:159
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr "У обязательного класса объектов \"%s\" версия не %s"
 
-#: include/setup_checks.inc:137
+#: include/functions_setup.inc:170
 #, fuzzy
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr "Поддержка Samba 3 отключена, не все схемы установлены!"
 
-#: include/setup_checks.inc:142
+#: include/functions_setup.inc:175
 msgid "SAMBA 3 support enabled"
 msgstr ""
 
-#: include/setup_checks.inc:147
+#: include/functions_setup.inc:180
 #, fuzzy
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr "Поддержка Samba 2 отключена, не все схемы установлены!"
 
-#: include/setup_checks.inc:152
+#: include/functions_setup.inc:185
 msgid "SAMBA 2 support enabled"
 msgstr ""
 
-#: include/setup_checks.inc:158
+#: include/functions_setup.inc:191
 #, fuzzy
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr "Поддержка PureFTP отключена, не все схемы установлены!"
 
-#: include/setup_checks.inc:163
+#: include/functions_setup.inc:196
 msgid "Support for pureftp enabled"
 msgstr ""
 
-#: include/setup_checks.inc:168
+#: include/functions_setup.inc:201
 #, fuzzy
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr "Поддержка WebDAV отключена, не все схемы установлены!"
 
-#: include/setup_checks.inc:173
+#: include/functions_setup.inc:206
 msgid "Support for WebDAV enabled"
 msgstr ""
 
-#: include/setup_checks.inc:178
+#: include/functions_setup.inc:211
 #, fuzzy
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
-#: include/setup_checks.inc:183
+#: include/functions_setup.inc:216
 #, fuzzy
 msgid "Support for phpgroupware enabled"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
-#: include/setup_checks.inc:188
+#: include/functions_setup.inc:221
 #, fuzzy
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr "Поддержка Gofon отключена, не все схемы установлены!"
 
-#: include/setup_checks.inc:193
+#: include/functions_setup.inc:226
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/setup_checks.inc:201
+#: 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/setup_checks.inc:210
+#: include/functions_setup.inc:243
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/setup_checks.inc:226
+#: include/functions_setup.inc:261
 msgid "OK"
 msgstr "OK"
 
-#: include/setup_checks.inc:229
+#: include/functions_setup.inc:264
 msgid "Ignored"
 msgstr "Пропуск"
 
-#: include/setup_checks.inc:231
+#: include/functions_setup.inc:266
 msgid "Failed"
 msgstr "Ошибка"
 
-#: include/setup_checks.inc:247
+#: include/functions_setup.inc:283
 msgid "PHP setup inspection"
 msgstr "Проверка конфигурации PHP"
 
-#: include/setup_checks.inc:248
+#: include/functions_setup.inc:284
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Проверка версии PHP (>=4.1.0)"
 
-#: include/setup_checks.inc:249
+#: 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."
@@ -6041,11 +7074,11 @@ msgstr ""
 "У вас должна быть установка PHP версии не ниже 4.1.0, так как в ней "
 "реализованы некоторые новые функции и исправлены некоторые ошибки."
 
-#: include/setup_checks.inc:252
+#: include/functions_setup.inc:288
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Проверка значения параметра register_globals (должно быть: off)"
 
-#: include/setup_checks.inc:253
+#: 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 "
@@ -6055,38 +7088,47 @@ msgstr ""
 "переменные доступными из сценария без смены области действия. Это может быть "
 "нарушением безопасности. Тем не менее, GOsa будет работать в любом случае."
 
-#: include/setup_checks.inc:256
+#: include/functions_setup.inc:292
 msgid "Checking for ldap module"
 msgstr "Проверка модуля ldap"
 
-#: include/setup_checks.inc:257
+#: include/functions_setup.inc:293
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Основной модуль, используемый GOsa, и поэтому обязательный."
 
-#: include/setup_checks.inc:260
+#: include/functions_setup.inc:296
+#, fuzzy
+msgid "Checking for XML functions"
+msgstr "Проверка поддержки gettext"
+
+#: include/functions_setup.inc:297
+msgid "XML functions are required to parse the configuration file."
+msgstr ""
+
+#: include/functions_setup.inc:300
 msgid "Checking for gettext support"
 msgstr "Проверка поддержки gettext"
 
-#: include/setup_checks.inc:261
+#: include/functions_setup.inc:301
 msgid "Gettext support is required for internationalized GOsa."
 msgstr "Необходима для локализованных версий GOsa."
 
-#: include/setup_checks.inc:263
+#: include/functions_setup.inc:303
 #, fuzzy
 msgid "Checking for iconv support"
 msgstr "Проверка поддержки gettext"
 
-#: include/setup_checks.inc:264
+#: include/functions_setup.inc:304
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/setup_checks.inc:267
+#: include/functions_setup.inc:307
 msgid "Checking for mhash module"
 msgstr "Проверка модуля mhash"
 
-#: include/setup_checks.inc:268
+#: 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."
@@ -6095,11 +7137,11 @@ msgstr ""
 "используете только алгоритмы crypt или MD5, не обращайте внимания на "
 "результат проверки. GOsa будет работать и без этого модуля."
 
-#: include/setup_checks.inc:271
+#: include/functions_setup.inc:311
 msgid "Checking for imap module"
 msgstr "Проверка модуля IMAP"
 
-#: include/setup_checks.inc:272
+#: 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."
@@ -6107,11 +7149,11 @@ msgstr ""
 "Этот модуль нужен для работы с сервером IMAP. С его помощью можно получать "
 "информацию о состоянии учетной записи, создавать и удалять пользователей."
 
-#: include/setup_checks.inc:274
+#: include/functions_setup.inc:315
 msgid "Checking for getacl in imap"
 msgstr "Проверка использования getacl в IMAP"
 
-#: include/setup_checks.inc:275
+#: 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 "
@@ -6121,21 +7163,21 @@ msgstr ""
 "Стандартный модуль IMAP не может обрабатывать acl. Для использования этой "
 "функции вам нужна последняя версия PHP."
 
-#: include/setup_checks.inc:277
+#: include/functions_setup.inc:319
 msgid "Checking for mysql module"
 msgstr "Проверка модуля mysql"
 
-#: include/setup_checks.inc:278
+#: include/functions_setup.inc:320
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Необходим для чтения отчетов о полученных факсимильных сообщениях из базы "
 "данных."
 
-#: include/setup_checks.inc:280
+#: include/functions_setup.inc:323
 msgid "Checking for cups module"
 msgstr "Проверка модуля cups"
 
-#: include/setup_checks.inc:281
+#: 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."
@@ -6143,11 +7185,11 @@ msgstr ""
 "Чтобы получать информацию о доступных принтерах по протоколу IPP вместо "
 "чтения файлов printcap, вам нужно установить модуль CUPS."
 
-#: include/setup_checks.inc:283
+#: include/functions_setup.inc:327
 msgid "Checking for kadm5 module"
 msgstr "Проверка модуля kadm5"
 
-#: include/setup_checks.inc:284
+#: include/functions_setup.inc:328
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -6155,15 +7197,25 @@ msgstr ""
 "Чтобы управлять пользователями с помощью Kerberos, необходим модуль kadm5, "
 "который можно загрузить из сети PEAR."
 
-#: include/setup_checks.inc:293
+#: include/functions_setup.inc:331
+#, fuzzy
+msgid "Checking for snmp Module"
+msgstr "Проверка модуля IMAP"
+
+#: include/functions_setup.inc:332
+msgid ""
+"Simple Network Management Protocol (SNMP) is required for client monitoring."
+msgstr ""
+
+#: include/functions_setup.inc:342
 msgid "Checking for some additional programms"
 msgstr "Проверка дополнительных программ"
 
-#: include/setup_checks.inc:302
+#: include/functions_setup.inc:351
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Проверка ImageMagick (>=5.4.0)"
 
-#: include/setup_checks.inc:303
+#: include/functions_setup.inc:352
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -6171,12 +7223,12 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/setup_checks.inc:306
+#: include/functions_setup.inc:355
 #, fuzzy
 msgid "Checking imagick module for PHP"
 msgstr "Проверка модуля IMAP"
 
-#: include/setup_checks.inc:307
+#: include/functions_setup.inc:356
 #, fuzzy
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
@@ -6185,11 +7237,11 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/setup_checks.inc:314
+#: include/functions_setup.inc:363
 msgid "Checking for fping utility"
 msgstr "Проверка утилиты fping"
 
-#: include/setup_checks.inc:315
+#: include/functions_setup.inc:364
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -6197,11 +7249,11 @@ msgstr ""
 "Эта программа используется, только если вы работате с бездисковыми "
 "терминалами."
 
-#: include/setup_checks.inc:330
+#: include/functions_setup.inc:379
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Проверка возможности создания хэшей LM/NT для паролей"
 
-#: include/setup_checks.inc:331
+#: include/functions_setup.inc:380
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -6209,71 +7261,71 @@ msgstr ""
 "Чтобы пользоваться Samba 2/3, вам нужно установить некоторые дополнительные "
 "программы для создания хэшей паролей."
 
-#: include/setup_checks.inc:362
+#: include/functions_setup.inc:393
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/setup_checks.inc:363
+#: 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/setup_checks.inc:368
+#: include/functions_setup.inc:397
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/setup_checks.inc:369
+#: include/functions_setup.inc:398
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/setup_checks.inc:376
+#: include/functions_setup.inc:405
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/setup_checks.inc:377
+#: include/functions_setup.inc:406
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/setup_checks.inc:384
+#: include/functions_setup.inc:413
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/setup_checks.inc:385
+#: include/functions_setup.inc:414
 msgid ""
-"GOsa needs at least 8MB of memory, less will cause unpredictable errors! An "
-"optimal setting would be 16MB, increase it for larger setups."
+"GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
+"Increase it for larger setups."
 msgstr ""
 
-#: include/setup_checks.inc:389
+#: include/functions_setup.inc:418
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/setup_checks.inc:390
+#: 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/setup_checks.inc:394
+#: include/functions_setup.inc:423
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/setup_checks.inc:395
+#: 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/setup_checks.inc:697
+#: include/functions_setup.inc:666
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Для продолжения укажите LDAP-сервер!"
 
-#: include/setup_checks.inc:707 include/setup_checks.inc:810
+#: 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."
@@ -6281,8 +7333,8 @@ msgstr ""
 "Не удается подключиться к указанному LDAP-серверу! Убедитесь, что он "
 "доступен GOsa."
 
-#: include/setup_checks.inc:724 include/setup_checks.inc:816
-#: include/setup_checks.inc:822
+#: 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 "
@@ -6290,139 +7342,61 @@ msgid ""
 msgstr ""
 "Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
 "доступен GOsa."
-
-#: include/setup_checks.inc:836
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
-msgstr ""
-
-#: include/setup_checks.inc:875
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-"Вы не заполнили обязательное поле \"%s\". Пожалуйста, заполните форму "
-"целиком."
-
-#: include/setup_checks.inc:912
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
-
-#: include/setup_checks.inc:1038 include/setup_checks.inc:1056
-#: html/index.php:160 ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"У вас нет учетной записи администратора для GOsa, так что вы не сможете что-"
-"либо администрировать!"
-
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Для этого DN нет расширений учетной записи."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Это пустой модуль."
-
-#: include/class_plugin.inc:386
-#, 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
-#, 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
-#, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
-
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Ошибка XML в gosa.conf: %s в строке %d"
-
-#: include/class_config.inc:195 html/index.php:142
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
-"администратору."
-
-#: include/class_config.inc:426
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
-
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr ""
-
-#: include/class_password-methods.inc:169
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr "Ошибка при установке пароля. Ответ LDAP-сервера: \"%s\"."
-
-#: include/class_password-methods.inc:188
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
-msgstr ""
-"Параметр SMBHASH в gosa.conf некорректен! Не удается сменить пароль Samba."
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Предупреждение: не удается создать пароль Kerberos. В вашей установке PHP "
-"нет поддержки Kerberos, пароль не был изменен."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "Ошибка подключения к базе данных Kerberos!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr "Ошибка смены пароля в базе данных Kerberos!"
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+
+#: 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/class_ldap.inc:398
+#: include/functions_setup.inc:834
 #, php-format
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
 msgstr ""
-"Ð\90вÑ\82омаÑ\82иÑ\87еÑ\81кое Ñ\81оздание Ñ\82ипа \"%s\" не поддеÑ\80живаеÑ\82Ñ\81Ñ\8f. Ð\9fожалÑ\83йÑ\81Ñ\82а, Ñ\81ообÑ\89иÑ\82е "
-"об этом команде разработчиков GOsa."
+"Ð\92Ñ\8b не заполнили обÑ\8fзаÑ\82елÑ\8cное поле \"%s\". Ð\9fожалÑ\83йÑ\81Ñ\82а, заполниÑ\82е Ñ\84оÑ\80мÑ\83 "
+"целиком."
 
-#: include/class_ldap.inc:630
-#, php-format
+#: include/functions_setup.inc:865
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
+"verify that it is readable for GOsa"
 msgstr ""
 
-#: include/class_ldap.inc:646
+#: include/functions_setup.inc:874
 #, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgid "Can't log into LDAP server. Reason was: %s."
+msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
+
+#: 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 ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+"У вас нет учетной записи администратора для GOsa, так что вы не сможете что-"
+"либо администрировать!"
+
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
+msgstr ""
+
+#: html/helpviewer.php:85
+msgid "previous"
 msgstr ""
 
-#: include/class_ldap.inc:661
+#: html/helpviewer.php:89
+#, fuzzy
+msgid "next"
+msgstr "текст"
+
+#: html/helpviewer.php:141
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 
 #: html/getfax.php:53
@@ -6443,14 +7417,14 @@ msgstr ""
 "Ошибка: для экспорта в формат vcard файлу getcvard.php нужно передать "
 "параметр!"
 
-#: html/setup.php:75
+#: html/setup.php:86
 #, fuzzy, php-format
 msgid ""
 "Directory '%s' specified as smarty compile directory is not accessable, "
 "check existence and rigths of this directory!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/main.php:100
+#: html/main.php:96
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -6458,43 +7432,59 @@ msgstr ""
 "Используется механизм register_globals. GOsa не допустит пользователей в "
 "систему, пока он не будет отключен администратором."
 
-#: html/main.php:143
+#: html/main.php:139
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr "Предупреждение: нехватка памяти, увеличьте значение memory_limit!"
 
-#: html/main.php:262
+#: html/main.php:263
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "Не удается найти определение для модуля \"%s\"!"
 
-#: html/index.php:57
+#: html/main.php:292
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+
+#: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 "Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
 
-#: html/index.php:79
+#: html/index.php:75
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessable!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/index.php:168
+#: html/index.php:148
+msgid ""
+"GOsa cannot retrieve information about the installed schema files. Please "
+"make sure, that this is possible."
+msgstr ""
+
+#: html/index.php:156
+msgid ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
+msgstr ""
+
+#: html/index.php:184
 msgid "Please specify a valid username!"
 msgstr "Введите корректное имя пользователя!"
 
-#: html/index.php:170
+#: html/index.php:186
 msgid "Please specify your password!"
 msgstr "Введите свой пароль!"
 
-#: html/index.php:177
+#: html/index.php:193
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:215
+#: html/index.php:231
 msgid "Session will not be encrypted."
 msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
 
-#: html/index.php:215
+#: html/index.php:231
 msgid "Enter SSL session"
 msgstr "Использовать шифрование SSL"
 
@@ -6529,13 +7519,11 @@ msgstr ""
 "Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
 "позволить использовать фильтры"
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/classic/conflict.tpl:2
-#: ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Конфликт сеансов"
 
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/classic/conflict.tpl:6
-#: ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -6548,8 +7536,7 @@ msgstr ""
 "(например, IE и Mozilla) возможно. Нажав на кнопку <b>Выход</b>, вы "
 "завершите текущий сеанс."
 
-#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/classic/conflict.tpl:10
-#: ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -6557,39 +7544,26 @@ msgstr ""
 "Если вы ничего не предпримете, редактируемые вами данные не будут сохранены, "
 "поэтому закройте все окна, кроме одного, и начните сеанс заново."
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/classic/conflict.tpl:14
-#: ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
 msgid "Logout"
 msgstr "Выход"
 
-#: ihtml/themes/altlinux/login.tpl:14 ihtml/themes/classic/login.tpl:14
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
 "Чтобы войти в систему<br> введите свои <i>имя пользователя</i> и <i>пароль</"
 "i>."
 
-#: ihtml/themes/altlinux/login.tpl:25 ihtml/themes/altlinux/login.tpl:29
-#: ihtml/themes/classic/login.tpl:25 ihtml/themes/classic/login.tpl:29
-#: ihtml/themes/default/login.tpl:25 ihtml/themes/default/login.tpl:29
-#: ihtml/themes/default/setup_useradmin.tpl:22
-msgid "Username"
-msgstr "Имя пользователя"
-
-#: ihtml/themes/altlinux/login.tpl:43 ihtml/themes/altlinux/login.tpl:46
-#: ihtml/themes/classic/login.tpl:43 ihtml/themes/classic/login.tpl:46
-#: ihtml/themes/default/login.tpl:43 ihtml/themes/default/login.tpl:46
+#: 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"
 msgstr "Каталог"
 
-#: ihtml/themes/altlinux/login.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:24 ihtml/themes/classic/login.tpl:54
-#: ihtml/themes/default/login.tpl:54
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
 msgid "Sign in"
 msgstr "Войти"
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/classic/login.tpl:55
-#: ihtml/themes/default/login.tpl:55
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
 msgid "Click here to log in"
 msgstr "Нажмите на эту кнопку, чтобы войти в систему"
 
@@ -6615,22 +7589,22 @@ msgstr ""
 "укажете параметры работы с LDAP-сервером, и мы проверим его настройку."
 
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/classic/framework.tpl:14 ihtml/themes/default/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15
 msgid "Main"
 msgstr "Начало"
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/classic/framework.tpl:16 ihtml/themes/default/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20
 msgid "Help"
 msgstr "Справка"
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/classic/framework.tpl:18 ihtml/themes/default/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25
 msgid "Sign out"
 msgstr "Выход"
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/classic/framework.tpl:23 ihtml/themes/default/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33
 msgid "Signed in:"
 msgstr "Пользователь:"
 
@@ -6652,16 +7626,7 @@ msgstr ""
 "На втором шаге происходит поиск вспомогательных программ и проверка "
 "допустимости их версии."
 
-#: ihtml/themes/altlinux/setup_step2.tpl:11
-msgid ""
-"We've inspected the webserver side now. Your setup seems to fit GOsa's "
-"needs. Lets go for the GOsa configuration part now..."
-msgstr ""
-"Ваш веб-сервер проверен. Его параметры подходят для работы с GOsa. Перейдите "
-"к настройке GOsa."
-
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/classic/islocked.tpl:2
-#: ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr "Конфликт блокировок"
 
@@ -6675,6 +7640,20 @@ msgstr ""
 "закрыл браузер во время редактирования данных. Вы можете удалить файл "
 "блокировки, нажав на кнопку <i>Удалить</i>."
 
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -6689,24 +7668,35 @@ msgstr ""
 "Samba-версии определяются автоматически по установленным классам объектов. "
 "Подробности об организации вашего дерева LDAP понадобятся позже."
 
-#: ihtml/themes/altlinux/setup_step3.tpl:7
-msgid "Please enter the server URI"
-msgstr "Введите адрес сервера"
+#: ihtml/themes/altlinux/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10
+msgid ""
+"Please enter the server URI to allow the setup to connect your LDAP server "
+"<i>(Example: ldap://your.server:389).</i>"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2
+msgid ""
+"The following fields allow the basic configuration of GOsa's behaviour and "
+"affect various properties in your main configuration."
+msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:4
+#: ihtml/themes/altlinux/setup_step4.tpl:7
 #: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Введите описание владельца каталога"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:8
+#: ihtml/themes/altlinux/setup_step4.tpl:11
 #: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Местоположение"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:14
+#: ihtml/themes/altlinux/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18
+#, fuzzy
 msgid ""
-"Finally, you need to specify parameters to access the LDAP server. GOsa "
-"always acts as admin and manages access rights internally. This is a "
+"GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
 "this to work, we need the admin DN and the corresponding password."
 msgstr ""
@@ -6717,17 +7707,17 @@ msgstr ""
 "работало, укажите DN (уникальное имя) администратора и соответствующий "
 "пароль."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:19
+#: ihtml/themes/altlinux/setup_step4.tpl:23
 #: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN администратора"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
+#: ihtml/themes/altlinux/setup_step4.tpl:27
 #: ihtml/themes/default/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Пароль администратора"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:29
+#: ihtml/themes/altlinux/setup_step4.tpl:34
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -6738,28 +7728,86 @@ msgstr ""
 "сохраняемой информации о пользователях и группах, а также на способ создания "
 "учетных записей. Проверьте, подходят ли вам значения, указанные ниже."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:34
+#: ihtml/themes/altlinux/setup_step4.tpl:39
 #: ihtml/themes/default/setup_step4.tpl:39
+#, fuzzy
+msgid "Base "
+msgstr "Ветка"
+
+#: ihtml/themes/altlinux/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Структурная единица (OU) пользователей"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:38
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/altlinux/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Атрибут DN пользователей"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:46
-#: ihtml/themes/default/setup_step4.tpl:51
+#: ihtml/themes/altlinux/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "OU групп"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:50
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/altlinux/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "База идентификаторов для пользователей/групп"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:56
-#: ihtml/themes/default/setup_step4.tpl:95
+#: ihtml/themes/altlinux/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67
+msgid ""
+"GOsa supports several encryption types for your passwords. Normally this is "
+"adjustable via user templates, but you can specify a default method to be "
+"used here, too."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72
+msgid "Encryption algorithm"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83
+msgid ""
+"GOsa has modular support for several mail methods. These methods provide "
+"interfaces to users mailboxes and general handling for quotas. You can "
+"choose the dummy plugin to leave all your mail settings untouched."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88
+#, fuzzy
+msgid "Mail method"
+msgstr "Почтовые настройки"
+
+#: 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 "Проверить"
 
@@ -6768,7 +7816,26 @@ msgstr "Проверить"
 msgid "Setup finished"
 msgstr "Настройка завершена"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:4
+#: ihtml/themes/altlinux/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3
+msgid ""
+"Basically the setup is finished. You can check the result of the schema "
+"check here and download the autogenerated gosa.conf below."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7
+#, fuzzy
+msgid "Schema Configuration"
+msgstr "Системная информация"
+
+#: ihtml/themes/altlinux/setup_finish.tpl:12
+#: ihtml/themes/default/setup_finish.tpl:12
+#, fuzzy
+msgid "Configuration File"
+msgstr "Настроить"
+
+#: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
@@ -6779,7 +7846,13 @@ msgstr ""
 "создания конфигурационного файла. Сохраните файл по этой ссылке как /etc/"
 "gosa/gosa/conf При необходимости, внесите свои изменения."
 
-#: ihtml/themes/altlinux/setup_finish.tpl:12
+#: ihtml/themes/altlinux/setup_finish.tpl:17
+#: ihtml/themes/default/setup_finish.tpl:17
+#, fuzzy
+msgid "Download configuration"
+msgstr "Системная информация"
+
+#: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
@@ -6790,102 +7863,205 @@ msgstr ""
 "пользователь веб-сервера может его читать. Для этого вам, возможно, "
 "понадобится выполнить следующие команды:"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:22
+#: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Повторить"
 
-#: ihtml/themes/classic/islocked.tpl:9
-msgid ""
-"If this is lock detection is false, the other person has obviously closed "
-"the webbrowser during the edit operation. You may delete the lockfile in "
-"this case by pressing the <i>Remove</i> button."
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
 msgstr ""
-"Если результат этой проверки блокировки - ложь, очевидно, другой человек "
-"закрыл браузер во время редактирования данных. Вы можете удалить оставшийся "
-"файл блокировки, нажав на кнопку <i>Удалить</i>."
 
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
 msgstr ""
 
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+"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/default/setup_step3.tpl:10
-msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"<i>(Example: ldap://your.server:389).</i>"
-msgstr ""
+#, 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 ""
+#~ "При изменении и создании стоп-листов появится интерактивный помощник для "
+#~ "редактирования их свойств. Перед удалением списка вам нужно будет "
+#~ "подтвердить свое решение."
 
-#: ihtml/themes/default/setup_step4.tpl:2
-msgid ""
-"The following fields allow the basic configuration of GOsa's behaviour and "
-"affect various properties in your main configuration."
-msgstr ""
+#~ msgid "Display lists of department"
+#~ msgstr "Стоп-листы в подразделении"
 
-#: ihtml/themes/default/setup_step4.tpl:18
 #, fuzzy
-msgid ""
-"GOsa always acts as admin and manages access rights internally. This is a "
-"workaround till OpenLDAP's in directory ACI's are fully implemented. For "
-"this to work, we need the admin DN and the corresponding password."
-msgstr ""
-"Сейчас вам нужно указать параметры доступа к LDAP-серверу. GOsa всегда "
-"выступает в роли администратора и управляет правами доступа самостоятельно. "
-"Это временное решение, пока в OpenLDAP не будут реализованы полностью "
-"средства контроля доступа (ACI) внутри каталогов. Чтобы это решение "
-"работало, укажите DN (уникальное имя) администратора и соответствующий "
-"пароль."
+#~ msgid ""
+#~ "-Edit- and -New...- will execute an assistant to aid you in editing group "
+#~ "properties. -Delete- will ask for confirmation before removing groups."
+#~ msgstr ""
+#~ "При изменении и создании групп появится интерактивный помощник для "
+#~ "редактирования их свойств. Перед удалением групп вам нужно будет "
+#~ "подтвердить свое решение."
 
-#: ihtml/themes/default/setup_step4.tpl:63
-msgid ""
-"GOsa supports several encryption types for your passwords. Normally this is "
-"adjustable via user templates, but you can specify a default method to be "
-"used here, too."
-msgstr ""
+#~ msgid "Dive into LDAP subtrees when searching"
+#~ msgstr "Искать в поддеревьях LDAP"
 
-#: ihtml/themes/default/setup_step4.tpl:68
-msgid "Encryption algorithm"
-msgstr ""
+#~ msgid "Search in subtrees"
+#~ msgstr "Искать в поддеревьях"
 
-#: ihtml/themes/default/setup_step4.tpl:79
-msgid ""
-"GOsa has modular support for several mail methods. These methods provide "
-"interfaces to users mailboxes and general handling for quotas. You can "
-"choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
+#, 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 вам нужно будет подтвердить свое решение."
 
-#: ihtml/themes/default/setup_step4.tpl:84
 #, fuzzy
-msgid "Mail method"
-msgstr "Почтовые настройки"
+#~ msgid ""
+#~ "-Edit- and -New...- will execute an assistant to aid you in editing "
+#~ "properties. -Delete- will ask for confirmation before removing "
+#~ "applications."
+#~ msgstr ""
+#~ "При изменении и создании приложений появится интерактивный помощник для "
+#~ "редактирования свойств. Перед удалением приложений вам нужно будет "
+#~ "подтвердить свое решение."
 
-#: ihtml/themes/default/setup_finish.tpl:3
-msgid ""
-"Basically the setup is finished. You can check the result of the schema "
-"check here and download the autogenerated gosa.conf below."
-msgstr ""
+#~ msgid "Display applications of department"
+#~ msgstr "Приложения в подразделении"
 
-#: ihtml/themes/default/setup_finish.tpl:7
 #, fuzzy
-msgid "Schema Configuration"
-msgstr "Системная информация"
+#~ 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 "Шаблон тонкого клиента для"
 
-#: ihtml/themes/default/setup_finish.tpl:12
 #, fuzzy
-msgid "Configuration File"
-msgstr "Настроить"
+#~ 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- спросит вас прежде чем действительно удалить объект из каталога."
 
-#: ihtml/themes/default/setup_finish.tpl:17
 #, fuzzy
-msgid "Download configuration"
-msgstr "Системная информация"
+#~ 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."
+#~ msgstr "Значение поля \"Квота\" некорректно."
+
+#~ msgid "Answering machine"
+#~ msgstr "Автоответчик"
+
+#~ msgid "Deliver missed calls as mail"
+#~ msgstr "Сообщать о пропущеных звонка по почте"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "Ссылки"
+
+#, fuzzy
+#~ msgid "Number"
+#~ msgstr "Ноябрь"
+
+#, fuzzy
+#~ msgid "Option"
+#~ msgstr "Параметры"
+
+#~ msgid "Select to see users that have ftp settings"
+#~ msgstr "Выберите, чтобы просмотреть пользователей с настройками FTP"
+
+#~ msgid "Show FTP users"
+#~ msgstr "Показать пользователей FTP"
+
+#~ msgid "Select to see users that have FAX settings"
+#~ msgstr "Выберите, чтобы просмотреть пользователей с настройками факсов"
+
+#~ msgid "Show FAX users"
+#~ msgstr "Показать пользователей факсов"
+
+#, fuzzy
+#~ msgid "Phone category"
+#~ msgstr "Телефонные отчеты"
+
+#, fuzzy
+#~ msgid "Serial"
+#~ msgstr "терминалы"
+
+#~ msgid ""
+#~ "We've inspected the webserver side now. Your setup seems to fit GOsa's "
+#~ "needs. Lets go for the GOsa configuration part now..."
+#~ msgstr ""
+#~ "Ваш веб-сервер проверен. Его параметры подходят для работы с GOsa. "
+#~ "Перейдите к настройке GOsa."
+
+#~ msgid "Please enter the server URI"
+#~ msgstr "Введите адрес сервера"
+
+#~ msgid ""
+#~ "Finally, you need to specify parameters to access the LDAP server. GOsa "
+#~ "always acts as admin and manages access rights internally. This is a "
+#~ "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
+#~ "this to work, we need the admin DN and the corresponding password."
+#~ msgstr ""
+#~ "Сейчас вам нужно указать параметры доступа к LDAP-серверу. GOsa всегда "
+#~ "выступает в роли администратора и управляет правами доступа "
+#~ "самостоятельно. Это временное решение, пока в OpenLDAP не будут "
+#~ "реализованы полностью средства контроля доступа (ACI) внутри каталогов. "
+#~ "Чтобы это решение работало, укажите DN (уникальное имя) администратора и "
+#~ "соответствующий пароль."
+
+#~ msgid "absent"
+#~ msgstr "отсутствует"
+
+#, fuzzy
+#~ msgid "Value specified as 'Quota Size' is empty."
+#~ msgstr "Значение поля \"Размер\" некорректно."
+
+#, fuzzy
+#~ msgid "Value specified as 'Quota Size' is not valid."
+#~ msgstr "Значение поля \"Размер\" некорректно."
+
+#~ msgid ""
+#~ "If this is lock detection is false, the other person has obviously closed "
+#~ "the webbrowser during the edit operation. You may delete the lockfile in "
+#~ "this case by pressing the <i>Remove</i> button."
+#~ msgstr ""
+#~ "Если результат этой проверки блокировки - ложь, очевидно, другой человек "
+#~ "закрыл браузер во время редактирования данных. Вы можете удалить "
+#~ "оставшийся файл блокировки, нажав на кнопку <i>Удалить</i>."
 
 #, fuzzy
 #~ msgid ""
@@ -6965,9 +8141,6 @@ msgstr "Системная информация"
 #~ "LDAPв формате ldif. Эти образы можно сохранять как резервные копии или "
 #~ "использовать при инициализации нового сервера."
 
-#~ msgid "Can't import an empty File"
-#~ msgstr "Невозможно импортиовать пустой файл"
-
 #~ msgid "Cant open file on server."
 #~ msgstr "Не могу открыть файл на сервере."