Moved from kolabd to kolab

[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 61cd734a68176b9850ebf405c42b08a9f4d53590..a62b110b1db0f29fbc33176f8950703071b84d5a 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -36,20 +36,21 @@ msgstr "Дополнительно"
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
+#: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/admin/fai/faiPartitionTable.tpl:4
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
+#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
+#: plugins/admin/systems/glpi.tpl:6 plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/ogroups/termgroup.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
@@ -71,7 +72,7 @@ msgstr "Окружение"
 #: plugins/admin/groups/class_divListGroup.inc:128
 #: plugins/admin/users/class_divListUsers.inc:166
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
-#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
@@ -109,9 +110,9 @@ msgstr "Факс"
 
 #: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:254
 #: plugins/personal/generic/generic.tpl:392
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_divListGroup.inc:134
@@ -160,12 +161,12 @@ msgid "Parameter"
 msgstr "Параметры загрузки"
 
 #: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:142
-#: plugins/admin/ogroups/tabs_ogroups.inc:92
+#: plugins/admin/ogroups/tabs_ogroups.inc:95
 msgid "Startup"
 msgstr "Запуск"
 
 #: contrib/gosa.conf:118 contrib/gosa.conf:143
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
 msgid "Devices"
 msgstr "Устройства"
 
@@ -186,10 +187,10 @@ msgstr "Принтер"
 #: plugins/admin/departments/headpage.tpl:20
 #: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:20
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -328,100 +329,111 @@ msgstr ""
 msgid "Polish"
 msgstr "Английский"
 
-#: plugins/personal/nagios/nagios.tpl:4
-#, fuzzy
-msgid "Nagios Account"
-msgstr "Контакт"
-
-#: plugins/personal/nagios/nagios.tpl:7
-#, fuzzy
-msgid "Alias"
-msgstr "женский"
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
-#, fuzzy
-msgid "Mail address"
-msgstr "MAC-адрес"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:11
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:29
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Что-то будет"
 
-#: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
 #, fuzzy
-msgid "Host notification period"
-msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b пÑ\80иложениÑ\8f"
+msgid "This account has no nagios extensions."
+msgstr "Ð\92 Ñ\8dÑ\82ой Ñ\83Ñ\87еÑ\82ной запиÑ\81и неÑ\82 поÑ\87Ñ\82овÑ\8bÑ\85 Ñ\80аÑ\81Ñ\88иÑ\80ений."
 
-#: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
 #, fuzzy
-msgid "Service notification period"
-msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b пÑ\80иложениÑ\8f"
+msgid "Remove nagios account"
+msgstr "УдалиÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
 
-#: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
 #, fuzzy
-msgid "Service notification options"
-msgstr "Параметры приложения"
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
 
-#: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "Host notification options"
-msgstr "Параметры приложения"
-
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:265
-#: plugins/addons/addressbook/address_edit.tpl:217
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
-msgstr "Пейджер"
+msgid "Create nagios account"
+msgstr "Создать настройки запись эл. почты"
 
-#: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "Service notification commands"
-msgstr "Параметры приложения"
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
 
-#: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:147
 #, fuzzy
-msgid "Host notification commands"
-msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b пÑ\80иложениÑ\8f"
+msgid "Saving nagios account failed"
+msgstr "СоздаÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки запиÑ\81Ñ\8c Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
 
-#: plugins/personal/nagios/nagios.tpl:66
+#: plugins/personal/nagios/class_nagiosAccount.inc:167
 #, fuzzy
-msgid "Nagios authentification"
-msgstr "РабоÑ\87аÑ\8f Ñ\81Ñ\82анÑ\86иÑ\8f Windows"
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\98мÑ\8f\" не заполнено."
 
-#: plugins/personal/nagios/nagios.tpl:69
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
 #, fuzzy
-msgid "view system informations"
-msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
+msgid "The required field 'NagiosMail' is not set."
+msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\98мÑ\8f\" не заполнено."
 
-#: plugins/personal/nagios/nagios.tpl:72
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:178
 #, fuzzy
-msgid "view configuration information"
-msgstr "Информация об организации"
-
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
-msgstr ""
+msgid "Please enter a valid email address in 'NagiosMail' field."
+msgstr "Введите корректное значение в поле \"Основной адрес\"."
 
-#: plugins/personal/nagios/nagios.tpl:78
+#: plugins/personal/nagios/class_nagiosAccount.inc:226
 #, fuzzy
-msgid "view all services"
-msgstr "Предоставлять службу сканирования"
-
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:86
-msgid "trigger all host commands"
-msgstr ""
+msgid "Removing nagios account failed"
+msgstr "Удалить настройки эл. почты"
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
 #: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
-#: plugins/personal/environment/main.inc:104
 #: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/main.inc:104
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
@@ -435,14 +447,14 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:623
 #: plugins/admin/applications/class_applicationManagement.inc:348
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/servnfs.tpl:114
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servdnseditzone.tpl:119
-#: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
 #: plugins/admin/systems/class_systemManagement.inc:476
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servnfs.tpl:114
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:261
 #: plugins/gofon/phoneaccount/main.inc:105
@@ -457,13 +469,13 @@ msgstr "Сохранить"
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
 #: plugins/personal/posix/main.inc:112 plugins/personal/netatalk/main.inc:106
-#: plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/environment/main.inc:106
+#: plugins/personal/samba/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -479,50 +491,51 @@ msgstr "Сохранить"
 #: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/fai/class_faiManagement.inc:528
 #: plugins/admin/fai/class_faiManagement.inc:533
-#: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiPackageConfiguration.tpl:7
+#: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiPackageNew.tpl:51
 #: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57
+#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiHookEntry.tpl:71
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/groups/class_groupManagement.inc:328
 #: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/group_objects.tpl:57
-#: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:68
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/password.tpl:23 plugins/admin/users/template.tpl:50
+#: plugins/admin/groups/application_options.tpl:13
+#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/class_userManagement.inc:625
-#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/users/template.tpl:50 plugins/admin/users/remove.tpl:16
+#: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpi_devices.tpl:761
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/servnfs.tpl:115
 #: plugins/admin/systems/SelectDeviceType.tpl:45
+#: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
-#: plugins/admin/systems/servdnseditzone.tpl:120
 #: plugins/admin/systems/glpiSelectUser.tpl:51
-#: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/servRepositorySetup.tpl:43
-#: plugins/admin/systems/glpi_edit_os.tpl:29
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:52
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/class_systemManagement.inc:478
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/servdnseditzone.tpl:120
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
@@ -531,8 +544,9 @@ msgstr "Сохранить"
 #: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
 #: plugins/gofon/conference/remove.tpl:16
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/altlinux/islocked.tpl:15
 #: ihtml/themes/default/copyPasteDialog.tpl:15
+#: ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -550,25 +564,24 @@ msgstr "Нажмите 'Изменить' чтобы отредактирова
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/netatalk/main.inc:112
 #: plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/main.inc:115
 #: plugins/personal/environment/environment.tpl:140
+#: plugins/personal/environment/main.inc:115
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85 plugins/admin/systems/glpiPrinter.tpl:73
+#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
+#: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
+#: plugins/admin/systems/printer.tpl:52 plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
-#: plugins/admin/systems/servdns.tpl:7
 #: plugins/admin/systems/glpiManufacturer.tpl:7
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:52
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Изменить"
@@ -578,229 +591,94 @@ msgstr "Изменить"
 msgid "Nagios settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/addons/godfs/class_dfsManagment.inc:11
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:29
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-msgid "This does something"
-msgstr "Что-то будет"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
+#: plugins/personal/nagios/nagios.tpl:4
 #, fuzzy
-msgid "This account has no nagios extensions."
-msgstr "Ð\92 Ñ\8dÑ\82ой Ñ\83Ñ\87еÑ\82ной запиÑ\81и неÑ\82 поÑ\87Ñ\82овÑ\8bÑ\85 Ñ\80аÑ\81Ñ\88иÑ\80ений."
+msgid "Nagios Account"
+msgstr "Ð\9aонÑ\82акÑ\82"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
+#: plugins/personal/nagios/nagios.tpl:7
 #, fuzzy
-msgid "Remove nagios account"
-msgstr "УдалиÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
+msgid "Alias"
+msgstr "женÑ\81кий"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
 #, fuzzy
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
-"их, щелкнув ниже."
+msgid "Mail address"
+msgstr "MAC-адрес"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:17
 #, fuzzy
-msgid "Create nagios account"
-msgstr "СоздаÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки запиÑ\81Ñ\8c Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
+msgid "Host notification period"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b пÑ\80иложениÑ\8f"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:25
 #, fuzzy
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
-"щелкнув ниже."
+msgid "Service notification period"
+msgstr "Параметры приложения"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:147
+#: plugins/personal/nagios/nagios.tpl:32
 #, fuzzy
-msgid "Saving nagios account failed"
-msgstr "СоздаÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки запиÑ\81Ñ\8c Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
+msgid "Service notification options"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b пÑ\80иложениÑ\8f"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:167
+#: plugins/personal/nagios/nagios.tpl:41
 #, fuzzy
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\98мÑ\8f\" не заполнено."
+msgid "Host notification options"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b пÑ\80иложениÑ\8f"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:170
-#, fuzzy
-msgid "The required field 'NagiosMail' is not set."
-msgstr "Обязательное поле \"Имя\" не заполнено."
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:265
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr "Пейджер"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:174
-#: plugins/personal/nagios/class_nagiosAccount.inc:178
+#: plugins/personal/nagios/nagios.tpl:53
 #, fuzzy
-msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное знаÑ\87ение в поле \"Ð\9eÑ\81новной адÑ\80еÑ\81\"."
+msgid "Service notification commands"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b пÑ\80иложениÑ\8f"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:226
+#: plugins/personal/nagios/nagios.tpl:57
 #, fuzzy
-msgid "Removing nagios account failed"
-msgstr "Удалить настройки эл. почты"
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr "Метод '%s' не описан в вашем файле конфигурации."
-
-#: plugins/personal/mail/class_mailAccount.inc:182
-msgid "No DESC tag in vacation file:"
-msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
-
-#: plugins/personal/mail/class_mailAccount.inc:222
-msgid "This account has no mail extensions."
-msgstr "В этой учетной записи нет почтовых расширений."
-
-#: plugins/personal/mail/class_mailAccount.inc:231
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr "Удалить настройки эл. почты"
-
-#: plugins/personal/mail/class_mailAccount.inc:232
-#: plugins/admin/groups/class_groupMail.inc:315
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
-"их, щелкнув ниже."
-
-#: plugins/personal/mail/class_mailAccount.inc:234
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
-msgstr "Создать настройки запись эл. почты"
-
-#: plugins/personal/mail/class_mailAccount.inc:234
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
-"щелкнув ниже."
-
-#: plugins/personal/mail/class_mailAccount.inc:282
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
-"кому должны пересылаться сообщения."
-
-#: plugins/personal/mail/class_mailAccount.inc:288
-#: plugins/admin/groups/class_groupMail.inc:377
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-"Добавление своего единственного адреса к списку пересылки не имеет смысла."
-
-#: plugins/personal/mail/class_mailAccount.inc:323
-#: plugins/personal/mail/class_mailAccount.inc:328
-#: plugins/admin/groups/class_groupMail.inc:405
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Вы пытаетесь добавить некорректный адрес электронной почты к списку "
-"альтернативных адресов."
+msgid "Host notification commands"
+msgstr "Параметры приложения"
 
-#: plugins/personal/mail/class_mailAccount.inc:338
-#: plugins/admin/groups/class_groupMail.inc:410
-msgid "The address you're trying to add is already used by user"
-msgstr "Ð\94обавлÑ\8fемÑ\8bй вами адÑ\80еÑ\81 Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f полÑ\8cзоваÑ\82елем"
+#: plugins/personal/nagios/nagios.tpl:66
+#, fuzzy
+msgid "Nagios authentification"
+msgstr "РабоÑ\87аÑ\8f Ñ\81Ñ\82анÑ\86иÑ\8f Windows"
 
-#: plugins/personal/mail/class_mailAccount.inc:574
+#: plugins/personal/nagios/nagios.tpl:69
 #, fuzzy
-msgid "Removing mail account failed"
-msgstr "УдалиÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
+msgid "view system informations"
+msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
 
-#: plugins/personal/mail/class_mailAccount.inc:677
+#: plugins/personal/nagios/nagios.tpl:72
 #, fuzzy
-msgid "Saving mail account failed"
-msgstr "УдалиÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
+msgid "view configuration information"
+msgstr "Ð\98нÑ\84оÑ\80маÑ\86иÑ\8f об оÑ\80ганизаÑ\86ии"
 
-#: plugins/personal/mail/class_mailAccount.inc:722
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/admin/groups/class_groupMail.inc:805
-msgid "The required field 'Primary address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
-
-#: plugins/personal/mail/class_mailAccount.inc:731
-#: plugins/personal/mail/class_mailAccount.inc:735
-#: plugins/addons/addressbook/class_addressbook.inc:589
-#: plugins/admin/ogroups/class_mailogroup.inc:71
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr "Введите корректное значение в поле \"Основной адрес\"."
-
-#: plugins/personal/mail/class_mailAccount.inc:741
-#: plugins/admin/groups/class_groupMail.inc:814
-#: plugins/admin/ogroups/class_mailogroup.inc:78
-msgid "The primary address you've entered is already in use."
-msgstr "Введенный вами адрес уже используется."
-
-#: plugins/personal/mail/class_mailAccount.inc:747
-#: plugins/admin/groups/class_groupMail.inc:820
-msgid "Value in 'Quota size' is not valid."
-msgstr "Значение поля \"Квота\" некорректно."
+#: plugins/personal/nagios/nagios.tpl:78
+#, fuzzy
+msgid "view all services"
+msgstr "Предоставлять службу сканирования"
 
-#: plugins/personal/mail/class_mailAccount.inc:756
-#: plugins/admin/groups/class_groupMail.inc:829
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
+msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:766
-#: plugins/admin/groups/class_groupMail.inc:837
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
+msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:770
-msgid "You specified Spam settings, but there is no Folder specified."
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
@@ -829,8 +707,8 @@ msgstr "Альтернативные адреса"
 #: plugins/personal/mail/copypaste.tpl:61 plugins/personal/mail/generic.tpl:57
 #: plugins/personal/mail/generic.tpl:128
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/paste_generic.tpl:61
 #: plugins/personal/posix/posix_groups.tpl:79
+#: plugins/personal/posix/paste_generic.tpl:61
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
@@ -847,42 +725,43 @@ msgstr "Альтернативные адреса"
 #: plugins/gofax/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
+#: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/groups/mail.tpl:51
-#: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:41
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:41
+#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:534
-#: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/paste_mail.tpl:30
+#: plugins/admin/groups/group_objects.tpl:55
+#: plugins/admin/groups/generic.tpl:108 plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/groups/mail_locals.tpl:66 plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
 #: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/workstationStartup.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:80
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/workstation.tpl:78
-#: plugins/admin/systems/terminalStartup.tpl:61
-#: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/class_termDNS.inc:427
-#: plugins/admin/systems/class_termDNS.inc:447
-#: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/workstationStartup.tpl:103
+#: plugins/admin/systems/workstationStartup.tpl:124
+#: plugins/admin/systems/workstationStartup.tpl:143
+#: plugins/admin/systems/terminal.tpl:99
 #: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
+#: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminalStartup.tpl:61
+#: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:386
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/glpiManufacturer.tpl:6
+#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:480
+#: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
@@ -915,35 +794,35 @@ msgstr "Добавить локально"
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiVariable.tpl:46
-#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
 #: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/groups/mail.tpl:52
-#: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/generic.tpl:110
-#: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/paste_mail.tpl:31
+#: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:110 plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
-#: plugins/admin/systems/workstationStartup.tpl:61
-#: plugins/admin/systems/workstationStartup.tpl:81
+#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
+#: plugins/admin/systems/workstationStartup.tpl:104
+#: plugins/admin/systems/workstationStartup.tpl:125
 #: plugins/admin/systems/terminal.tpl:101
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/class_termDNS.inc:441
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
+#: plugins/admin/systems/class_servDNSeditZone.inc:480
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/glpi_edit_os.tpl:10
-#: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
-#: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/class_servDNSeditZone.inc:292
-#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/class_termDNS.inc:474
+#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/ogroups/termgroup.tpl:25 plugins/admin/ogroups/generic.tpl:44
 #: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:13
@@ -978,7 +857,7 @@ msgid "Quota usage"
 msgstr "Использование квоты"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:170
+#: plugins/admin/systems/class_terminalInfo.inc:169
 #: plugins/admin/systems/class_printGeneric.inc:485
 msgid "not defined"
 msgstr "не определена"
@@ -1064,17 +943,141 @@ msgstr "Использовать другой сценарий SIEVE"
 msgid "disables all Mail options!"
 msgstr "отключает все почтовые настройки!"
 
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr "Почтовые настройки пользователя"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr "Метод '%s' не описан в вашем файле конфигурации."
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "Выберите адреса для добавления"
+#: plugins/personal/mail/class_mailAccount.inc:182
+msgid "No DESC tag in vacation file:"
+msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
 
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:21
+#: plugins/personal/mail/class_mailAccount.inc:222
+msgid "This account has no mail extensions."
+msgstr "В этой учетной записи нет почтовых расширений."
+
+#: plugins/personal/mail/class_mailAccount.inc:231
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:232
+#: plugins/admin/groups/class_groupMail.inc:315
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
+
+#: plugins/personal/mail/class_mailAccount.inc:234
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
+msgstr "Создать настройки запись эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:234
+#: plugins/admin/groups/class_groupMail.inc:318
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
+
+#: plugins/personal/mail/class_mailAccount.inc:282
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
+"кому должны пересылаться сообщения."
+
+#: plugins/personal/mail/class_mailAccount.inc:288
+#: plugins/admin/groups/class_groupMail.inc:377
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+"Добавление своего единственного адреса к списку пересылки не имеет смысла."
+
+#: plugins/personal/mail/class_mailAccount.inc:323
+#: plugins/personal/mail/class_mailAccount.inc:328
+#: plugins/admin/groups/class_groupMail.inc:405
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку "
+"альтернативных адресов."
+
+#: plugins/personal/mail/class_mailAccount.inc:338
+#: plugins/admin/groups/class_groupMail.inc:410
+msgid "The address you're trying to add is already used by user"
+msgstr "Добавляемый вами адрес уже используется пользователем"
+
+#: plugins/personal/mail/class_mailAccount.inc:574
+#, fuzzy
+msgid "Removing mail account failed"
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:677
+#, fuzzy
+msgid "Saving mail account failed"
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:722
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/admin/groups/class_groupMail.inc:805
+msgid "The required field 'Primary address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+
+#: plugins/personal/mail/class_mailAccount.inc:731
+#: plugins/personal/mail/class_mailAccount.inc:735
+#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/admin/ogroups/class_mailogroup.inc:71
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr "Введите корректное значение в поле \"Основной адрес\"."
+
+#: plugins/personal/mail/class_mailAccount.inc:741
+#: plugins/admin/groups/class_groupMail.inc:814
+#: plugins/admin/ogroups/class_mailogroup.inc:78
+msgid "The primary address you've entered is already in use."
+msgstr "Введенный вами адрес уже используется."
+
+#: plugins/personal/mail/class_mailAccount.inc:747
+#: plugins/admin/groups/class_groupMail.inc:820
+msgid "Value in 'Quota size' is not valid."
+msgstr "Значение поля \"Квота\" некорректно."
+
+#: plugins/personal/mail/class_mailAccount.inc:756
+#: plugins/admin/groups/class_groupMail.inc:829
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
+
+#: plugins/personal/mail/class_mailAccount.inc:766
+#: plugins/admin/groups/class_groupMail.inc:837
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
+
+#: plugins/personal/mail/class_mailAccount.inc:770
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "Выберите адреса для добавления"
+
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:21
 #: plugins/personal/samba/samba3_workstations.tpl:20
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
@@ -1086,12 +1089,12 @@ msgstr "Выберите адреса для добавления"
 #: plugins/admin/groups/group_objects.tpl:20
 #: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/systems/glpiDeviceManagement.tpl:27
-#: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/systems/glpiSelectUser.tpl:27
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/gofon/macro/headpage.tpl:29
@@ -1139,15 +1142,14 @@ msgstr "Имя пользователя, адрес которого показ
 #: 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 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
 msgid "Password"
 msgstr "Пароль"
 
 #: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/password_expired.tpl:2
 #: plugins/personal/password/changed.tpl:2
 #: plugins/admin/users/class_divListUsers.inc:146
 msgid "Change password"
@@ -1165,7 +1167,6 @@ msgstr ""
 "войти в систему."
 
 #: plugins/personal/password/password.tpl:10
-#: plugins/personal/password/password_expired.tpl:10
 #: plugins/admin/users/password.tpl:6
 #, fuzzy
 msgid ""
@@ -1176,47 +1177,31 @@ msgstr ""
 "сервера, Samba и служб UNIX."
 
 #: plugins/personal/password/password.tpl:15
-#: plugins/personal/password/password_expired.tpl:15
 msgid "Current password"
 msgstr "Текущий пароль"
 
 #: plugins/personal/password/password.tpl:20
-#: plugins/personal/password/password_expired.tpl:20
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
 #: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr "Новый пароль"
 
 #: plugins/personal/password/password.tpl:25
-#: plugins/personal/password/password_expired.tpl:25
 #: plugins/personal/generic/password.tpl:11
 #: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr "Подтверждение"
 
 #: plugins/personal/password/password.tpl:34
-#: plugins/personal/password/password_expired.tpl:34
 #: plugins/personal/generic/password.tpl:17
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr "Изменить пароль"
 
 #: plugins/personal/password/password.tpl:36
-#: plugins/personal/password/password_expired.tpl:36
 msgid "Clear fields"
 msgstr "Очистить поля"
 
-#: plugins/personal/password/password_expired.tpl:6
-#, fuzzy
-msgid ""
-"Your password has expired. To change your personal password use the fields "
-"below. The changes take effect immediately. Please memorize the new "
-"password, because you wouldn't be able to login without it."
-msgstr ""
-"В полях ниже вы можете изменить свой пароль. Изменения вступят в силу "
-"немедленно. Пожалуйста, запомните новый пароль, так как иначе вы не сможете "
-"войти в систему."
-
 #: plugins/personal/password/changed.tpl:6
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
@@ -1233,14 +1218,14 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/admin/fai/faiNewBranch.tpl:50
-#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1378
+#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1472
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: 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_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:114
@@ -1285,43 +1270,15 @@ msgstr "У вас недостаточно прав для смены своег
 msgid "External password changer reported a problem: "
 msgstr "При попытке сменить пароль извне возникла проблема: "
 
-#: plugins/personal/posix/paste_generic.tpl:4
+#: plugins/personal/password/nochange.tpl:2
 #, fuzzy
-msgid "Posix settings"
-msgstr "Атрибуты UNIX"
-
-#: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:643
-msgid "Home directory"
-msgstr "Домашний каталог"
-
-#: plugins/personal/posix/paste_generic.tpl:23
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Указать UID/GID вручную"
-
-#: plugins/personal/posix/paste_generic.tpl:28
-#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/paste_generic.tpl:47
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Членство в группах"
+msgid "Password change not allowed"
+msgstr "Сменить пароль"
 
-#: plugins/personal/posix/paste_generic.tpl:54
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr ""
-"(Предупреждение: NFS не поддерживает более 16 групп для одного пользователя!)"
+#: plugins/personal/password/nochange.tpl:6
+#, fuzzy
+msgid "You are not allowed to change your password at this time"
+msgstr "Вам не разрешено менять пароль."
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -1373,58 +1330,138 @@ msgstr "Пользователь должен сменить пароль при
 msgid "Password expires on"
 msgstr "Срок действия пароля истекает"
 
-#: plugins/personal/posix/class_posixAccount.inc:16
-#: plugins/generic/references/class_reference.inc:22
-msgid "UNIX"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:125
+#: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
-msgid "expired"
-msgstr "ЭкÑ\81поÑ\80Ñ\82"
+msgid "Posix settings"
+msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82Ñ\8b UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:127
-msgid "grace time active"
-msgstr ""
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:643
+msgid "Home directory"
+msgstr "Домашний каталог"
 
-#: plugins/personal/posix/class_posixAccount.inc:130
-#, fuzzy
-msgid "active, password not changable"
-msgstr "Ð\9dовÑ\8bй паÑ\80олÑ\8c"
+#: plugins/personal/posix/paste_generic.tpl:23
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "УказаÑ\82Ñ\8c UID/GID вÑ\80Ñ\83Ñ\87нÑ\83Ñ\8e"
 
-#: plugins/personal/posix/class_posixAccount.inc:132
-#, fuzzy
-msgid "active, password expired"
-msgstr "Срок действия пароля истекает"
+#: plugins/personal/posix/paste_generic.tpl:28
+#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
+msgid "UID"
+msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:134
-#, fuzzy
-msgid "active"
-msgstr "Личный"
+#: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:145
-#: plugins/personal/posix/class_posixAccount.inc:973
-msgid "Group of user"
-msgstr "Ð\93Ñ\80Ñ\83ппа полÑ\8cзоваÑ\82елÑ\8f"
+#: plugins/personal/posix/paste_generic.tpl:47
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "ЧленÑ\81Ñ\82во в гÑ\80Ñ\83ппаÑ\85"
 
-#: plugins/personal/posix/class_posixAccount.inc:185
-msgid "unconfigured"
-msgstr "Не настроено"
+#: plugins/personal/posix/paste_generic.tpl:54
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+"(Предупреждение: NFS не поддерживает более 16 групп для одного пользователя!)"
 
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/systems/class_workstationService.inc:188
-#: plugins/admin/systems/class_workstationStartup.inc:726
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
-msgid "automatic"
-msgstr "автоматически"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Выберите системы для добавления"
 
-#: plugins/personal/posix/class_posixAccount.inc:242
-msgid "This account has no unix extensions."
-msgstr "Ð\92 Ñ\8dÑ\82ой Ñ\83Ñ\87еÑ\82ной запиÑ\81и неÑ\82 Ñ\80аÑ\81Ñ\88иÑ\80ений UNIX."
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81иÑ\81Ñ\82емÑ\8b в подÑ\80азделении"
 
-#: plugins/personal/posix/class_posixAccount.inc:262
-#: plugins/personal/posix/class_posixAccount.inc:265
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/class_divListSystem.inc:69
+msgid "Display systems matching"
+msgstr "Показать подходяшие системы"
+
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Оболочка"
+
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr "Основная группа"
+
+#: plugins/personal/posix/generic.tpl:29
+#: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/gofax/faxreports/contents.tpl:32
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
+#: plugins/gofon/fonreports/contents.tpl:35
+msgid "Status"
+msgstr "Состояние"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Учетная запись"
+
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
+msgstr "Системные доверия"
+
+#: plugins/personal/posix/generic.tpl:92
+#, fuzzy
+msgid "Trust mode"
+msgstr "Режим"
+
+#: plugins/personal/posix/class_posixAccount.inc:16
+#: plugins/generic/references/class_reference.inc:22
+msgid "UNIX"
+msgstr "Unix"
+
+#: plugins/personal/posix/class_posixAccount.inc:125
+#, fuzzy
+msgid "expired"
+msgstr "Экспорт"
+
+#: plugins/personal/posix/class_posixAccount.inc:127
+msgid "grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:130
+#, fuzzy
+msgid "active, password not changable"
+msgstr "Новый пароль"
+
+#: plugins/personal/posix/class_posixAccount.inc:132
+#, fuzzy
+msgid "active, password expired"
+msgstr "Срок действия пароля истекает"
+
+#: plugins/personal/posix/class_posixAccount.inc:134
+#, fuzzy
+msgid "active"
+msgstr "Личный"
+
+#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:973
+msgid "Group of user"
+msgstr "Группа пользователя"
+
+#: plugins/personal/posix/class_posixAccount.inc:185
+msgid "unconfigured"
+msgstr "Не настроено"
+
+#: plugins/personal/posix/class_posixAccount.inc:203
+#: plugins/admin/systems/class_terminalService.inc:194
+#: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_workstationStartup.inc:786
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
+msgid "automatic"
+msgstr "автоматически"
+
+#: plugins/personal/posix/class_posixAccount.inc:242
+msgid "This account has no unix extensions."
+msgstr "В этой учетной записи нет расширений UNIX."
+
+#: plugins/personal/posix/class_posixAccount.inc:262
+#: plugins/personal/posix/class_posixAccount.inc:265
 msgid "Remove posix account"
 msgstr "Удалить учетную запись POSIX"
 
@@ -1691,48 +1728,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Выберите системы для добавления"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Показать системы в подразделении"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:69
-msgid "Display systems matching"
-msgstr "Показать подходяшие системы"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Оболочка"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Основная группа"
-
-#: plugins/personal/posix/generic.tpl:29
-#: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/contents.tpl:32
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
-#: plugins/gofon/fonreports/contents.tpl:35
-msgid "Status"
-msgstr "Состояние"
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Учетная запись"
-
-#: plugins/personal/posix/generic.tpl:91
-msgid "System trust"
-msgstr "Системные доверия"
-
-#: plugins/personal/posix/generic.tpl:92
-#, fuzzy
-msgid "Trust mode"
-msgstr "Режим"
-
 #: plugins/personal/posix/main.inc:131
 msgid "Unix settings"
 msgstr "Атрибуты UNIX"
@@ -1938,10 +1933,6 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Настройки Samba"
-
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Выберите рабочие станции для добавления"
@@ -1950,6 +1941,10 @@ msgstr "Выберите рабочие станции для добавлени
 msgid "Display workstations of department"
 msgstr "Показать рабочие станции подразделения"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Настройки Samba"
+
 #: plugins/personal/samba/class_sambaAccount.inc:198
 msgid "This account has no samba extensions."
 msgstr "В этой учетной записи нет расширений Samba."
@@ -2063,11 +2058,6 @@ msgstr ""
 msgid "Saving Samba account failed"
 msgstr ""
 
-#: plugins/personal/environment/main.inc:124
-#, fuzzy
-msgid "User environment settings"
-msgstr "Почтовые настройки пользователя"
-
 #: plugins/personal/environment/class_hotplugDialog.inc:113
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
@@ -2128,128 +2118,6 @@ msgstr "Фильтр"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:69
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
-#, fuzzy
-msgid "Please select a printer or press cancel."
-msgstr "Введите корректный номер телефона!"
-
-#: plugins/personal/environment/class_environment.inc:185
-#, fuzzy
-msgid "auto"
-msgstr "Отношение"
-
-#: plugins/personal/environment/class_environment.inc:207
-#: plugins/admin/systems/class_workstationService.inc:89
-#: plugins/admin/systems/class_terminalService.inc:95
-#, php-format
-msgid ""
-"You have specified an external resolution hook which can't be read, please "
-"check the permission of the file '%s'."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
-#, fuzzy
-msgid "Remove environment extension"
-msgstr "Удалить параметры"
-
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
-#, fuzzy
-msgid "Environment extension enabled. You can disable it by clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
-
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
-msgid "Add environment extension"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
-#, fuzzy
-msgid "Environment extension disabled. You can enable it by clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
-#, fuzzy
-msgid ""
-"Environment extension disabled. You have to setup a posix account before you "
-"can enable this feature."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/personal/environment/class_environment.inc:438
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
-#, fuzzy
-msgid "None"
-msgstr "нет"
-
-#: plugins/personal/environment/class_environment.inc:443
-#, php-format
-msgid ""
-"The selected kiosk profile '%s' is no longer available, setting current "
-"profile to 'none'."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:539
-#: plugins/personal/environment/class_environment.inc:550
-#: plugins/admin/systems/class_workstationStartup.inc:563
-#: plugins/admin/systems/class_terminalStartup.inc:165
-#, fuzzy
-msgid "You must specify a valid mount point."
-msgstr "Введите корректное имя пользователя!"
-
-#: plugins/personal/environment/class_environment.inc:751
-#, fuzzy
-msgid "Removing environment information failed"
-msgstr "Удалить параметры"
-
-#: plugins/personal/environment/class_environment.inc:804
-#, fuzzy
-msgid "Please set a valid profile quota size."
-msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
-
-#: plugins/personal/environment/class_environment.inc:811
-msgid ""
-"You need to setup a valid posix extension in order to enable evironment "
-"features."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:849
-msgid "Can't save new kiosk profiles, possibly permission denied for folder"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:943
-msgid "Error while writing printer"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1013
-msgid "Error while writing printer settings"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1082
-#, fuzzy
-msgid "Adding environment information failed"
-msgstr "Изменить свойства"
-
-#: plugins/personal/environment/class_environment.inc:1125
-#, fuzzy
-msgid "Administrator"
-msgstr "Администрирование"
-
-#: plugins/personal/environment/class_environment.inc:1130
-msgid "Default printer"
-msgstr "Принтер по умолчанию"
-
 #: plugins/personal/environment/selectPrinterDialog.tpl:1
 #, fuzzy
 msgid "Add printer devcies"
@@ -2337,9 +2205,9 @@ msgid "Resolution"
 msgstr "Разрешение"
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/admin/systems/workstationStartup.tpl:85
-#: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/terminalStartup.tpl:66
 #, fuzzy
 msgid "Shares"
 msgstr "сброс"
@@ -2355,12 +2223,12 @@ msgstr "сброс"
 #: plugins/admin/groups/class_groupMail.inc:538
 #: plugins/admin/applications/class_applicationParameters.inc:100
 #: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/workstationStartup.tpl:100
+#: plugins/admin/systems/printer.tpl:53
+#: plugins/admin/systems/workstationStartup.tpl:144
 #: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/printer.tpl:53
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:387
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
 #: ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr "Удалить"
@@ -2411,10 +2279,20 @@ msgstr "Личная информация"
 msgid "Toggle default"
 msgstr "по умолчанию"
 
-#: plugins/personal/environment/logonManagement.tpl:8
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
 #, fuzzy
-msgid "Logon script settings"
-msgstr "Атрибуты UNIX"
+msgid "Specified name is invalid."
+msgstr "Указанное имя уже используется."
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:101
+#, fuzzy
+msgid "Specified description contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/personal/environment/logonManagement.tpl:8
+#, fuzzy
+msgid "Logon script settings"
+msgstr "Атрибуты UNIX"
 
 #: plugins/personal/environment/logonManagement.tpl:10
 #, fuzzy
@@ -2424,20 +2302,22 @@ msgstr "Список"
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
 #: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/phone.tpl:30
-#: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/phone.tpl:30 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:30
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
 #: plugins/gofon/conference/generic.tpl:56
@@ -2470,30 +2350,42 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/application_options.tpl:11
 #: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr "Применить"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:97
-#, fuzzy
-msgid "Specified name is invalid."
-msgstr "Указанное имя уже используется."
+#: plugins/personal/environment/class_kioskManagementDialog.inc:67
+#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:101
-#, fuzzy
-msgid "Specified description contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:130
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 #, fuzzy
@@ -2516,28 +2408,6 @@ msgstr "Имя сервера"
 msgid "Device ID"
 msgstr "Устройства"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid ""
-"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
-#, php-format
-msgid "Kiosk path '%s' is not accessible. Please check the permissions."
-msgstr ""
-
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 #, fuzzy
@@ -2553,169 +2423,144 @@ msgstr "Просмотр"
 #: plugins/personal/environment/kioskManagement.tpl:25
 #: plugins/admin/fai/class_faiSummaryTab.inc:222
 #: plugins/admin/systems/glpi_edit_type.tpl:15
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
-#: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
+#: plugins/admin/systems/glpi_edit_os.tpl:15
+#: plugins/admin/systems/glpiManufacturer.tpl:13
 #: include/class_MultiSelectWindow.inc:67
 #, fuzzy
 msgid "Close"
 msgstr "Выбрать"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "женский"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "мужской"
-
-#: plugins/personal/generic/class_user.inc:272
-msgid "This account has no valid GOsa extensions."
-msgstr "Для этой учетной записи нет корректных расширений GOsa."
-
-#: plugins/personal/generic/class_user.inc:326
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
-"прервана."
+#: plugins/personal/environment/main.inc:124
+#, fuzzy
+msgid "User environment settings"
+msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/generic/class_user.inc:422
-msgid "Please enter a valid serial number"
-msgstr "Введите корректный серийный номер"
+#: plugins/personal/environment/class_environment.inc:185
+#, fuzzy
+msgid "auto"
+msgstr "Отношение"
 
-#: plugins/personal/generic/class_user.inc:459
+#: plugins/personal/environment/class_environment.inc:207
+#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:88
 #, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
+msgid ""
+"You have specified an external resolution hook which can't be read, please "
+"check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:459
-msgid "valid"
+#: plugins/personal/environment/class_environment.inc:284
+#: plugins/personal/environment/class_environment.inc:321
+#, fuzzy
+msgid "Remove environment extension"
+msgstr "Удалить параметры"
+
+#: plugins/personal/environment/class_environment.inc:285
+#: plugins/personal/environment/class_environment.inc:322
+#, fuzzy
+msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/personal/generic/class_user.inc:459
-msgid "invalid"
+#: plugins/personal/environment/class_environment.inc:294
+#: plugins/personal/environment/class_environment.inc:299
+#: plugins/personal/environment/class_environment.inc:327
+#: plugins/personal/environment/class_environment.inc:332
+msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:463
+#: plugins/personal/environment/class_environment.inc:295
+#: plugins/personal/environment/class_environment.inc:328
 #, fuzzy
-msgid "No certificate installed"
-msgstr "Изменить сертификаты"
-
-#: plugins/personal/generic/class_user.inc:546
-msgid "Removing generic user account failed"
+msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/personal/generic/class_user.inc:835
-msgid "Saving generic user account failed"
+#: plugins/personal/environment/class_environment.inc:300
+#: plugins/personal/environment/class_environment.inc:333
+#, fuzzy
+msgid ""
+"Environment extension disabled. You have to setup a posix account before you "
+"can enable this feature."
 msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/personal/generic/class_user.inc:882
-msgid "Kerberos database communication failed"
-msgstr "Ошибка соединения с базой данных Kerberos"
-
-#: plugins/personal/generic/class_user.inc:899
-msgid "Can't remove user from kerberos database."
-msgstr "Не удается удалить пользователя из базы данных Kerberos."
-
-#: plugins/personal/generic/class_user.inc:910
-msgid "Can't add user to kerberos database."
-msgstr "Не удается добавить пользователя в базу данных Kerberos."
-
-#: plugins/personal/generic/class_user.inc:954
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
-
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/environment/class_environment.inc:448
+#: plugins/personal/environment/class_environment.inc:697
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 #, fuzzy
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f полÑ\8cзоваÑ\82елÑ\8f в Ñ\8dÑ\82ой веÑ\82ке."
+msgid "None"
+msgstr "неÑ\82"
 
-#: plugins/personal/generic/class_user.inc:965
-#: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:517
-msgid "The required field 'Name' is not set."
-msgstr "Обязательное поле \"Имя\" не заполнено."
+#: plugins/personal/environment/class_environment.inc:531
+#: plugins/personal/environment/class_environment.inc:542
+#: plugins/admin/systems/class_workstationStartup.inc:610
+#: plugins/admin/systems/class_terminalStartup.inc:187
+#, fuzzy
+msgid "You must specify a valid mount point."
+msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/generic/class_user.inc:974
-msgid "There's already a person with this 'Login' in the database."
+#: plugins/personal/environment/class_environment.inc:700
+#, php-format
+msgid ""
+"The selected kiosk profile '%s' is no longer available, setting current "
+"profile to 'none'."
 msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/personal/generic/class_user.inc:980
-#: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:520
-msgid "The required field 'Given name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
+#: plugins/personal/environment/class_environment.inc:752
+#, fuzzy
+msgid "Removing environment information failed"
+msgstr "Удалить параметры"
 
-#: plugins/personal/generic/class_user.inc:983
-msgid "The required field 'Login' is not set."
-msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
+#: plugins/personal/environment/class_environment.inc:805
+#, fuzzy
+msgid "Please set a valid profile quota size."
+msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/environment/class_environment.inc:812
 msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+"You need to setup a valid posix extension in order to enable evironment "
+"features."
 msgstr ""
-"Пользователь с такой комбинацией имени и личного имени в базе данных уже "
-"существует."
 
-#: plugins/personal/generic/class_user.inc:997
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+#: plugins/personal/environment/class_environment.inc:850
+msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
-"Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
-"Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/personal/generic/class_user.inc:1000
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
+#: plugins/personal/environment/class_environment.inc:944
+msgid "Error while writing printer"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
-#: plugins/addons/addressbook/class_addressbook.inc:556
-#: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
-msgid "The field 'Name' contains invalid characters."
-msgstr "Значение поля \"Имя\" содержит недопустимые символы."
+#: plugins/personal/environment/class_environment.inc:1014
+msgid "Error while writing printer settings"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
-#: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/addons/addressbook/class_addressbook.inc:581
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
+#: plugins/personal/environment/class_environment.inc:1083
+#, fuzzy
+msgid "Adding environment information failed"
+msgstr "Изменить свойства"
 
-#: plugins/personal/generic/class_user.inc:1011
-#: plugins/addons/addressbook/class_addressbook.inc:564
-#: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
+#: plugins/personal/environment/class_environment.inc:1126
+#, fuzzy
+msgid "Administrator"
+msgstr "Администрирование"
 
-#: plugins/personal/generic/class_user.inc:1014
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
+#: plugins/personal/environment/class_environment.inc:1131
+msgid "Default printer"
+msgstr "Принтер по умолчанию"
 
-#: plugins/personal/generic/class_user.inc:1017
-#: plugins/addons/addressbook/class_addressbook.inc:573
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
-
-#: plugins/personal/generic/class_user.inc:1020
-#: plugins/addons/addressbook/class_addressbook.inc:576
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
-
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
 #, fuzzy
-msgid "Could not open specified certificate!"
-msgstr "Ð\9dевозможно вÑ\8bбÑ\80аÑ\82Ñ\8c базÑ\83 даннÑ\8bÑ\85!"
+msgid "Please select a printer or press cancel."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она!"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2727,50 +2572,74 @@ msgstr ""
 "свой пароль снова. GOsa произведет шифрование в соответствии с выбраной "
 "схемой."
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Личная информация"
-
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
+#: plugins/personal/generic/generic.tpl:19
+#: plugins/personal/generic/generic.tpl:32
 msgid "Personal picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
-msgid "Change picture"
-msgstr "Сменить изображение"
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr "Удалить изображение"
+
+#: plugins/personal/generic/paste_generic.tpl:4
+#, fuzzy
+msgid "User settings"
+msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/generic/generic.tpl:43
 #: plugins/personal/generic/paste_generic.tpl:7
+#: plugins/personal/generic/generic.tpl:43
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 #, fuzzy
 msgid "Last name"
 msgstr "Список"
 
-#: plugins/personal/generic/generic.tpl:48
-#, fuzzy
-msgid "Template name"
-msgstr "Шаблон"
-
-#: plugins/personal/generic/generic.tpl:55
 #: plugins/personal/generic/paste_generic.tpl:11
+#: plugins/personal/generic/generic.tpl:55
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 #, fuzzy
 msgid "First name"
 msgstr "Список"
 
-#: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/admin/users/template.tpl:32
+#: plugins/personal/generic/generic.tpl:59 plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Имя пользователя"
 
+#: plugins/personal/generic/paste_generic.tpl:22
+#, fuzzy
+msgid "User picture"
+msgstr "Изображение"
+
+#: plugins/personal/generic/paste_generic.tpl:35
+#, fuzzy
+msgid "Clear password"
+msgstr "Новый пароль"
+
+#: plugins/personal/generic/paste_generic.tpl:36
+#, fuzzy
+msgid "Set new password"
+msgstr "Изменить пароль"
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Личная информация"
+
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:34
+msgid "Change picture"
+msgstr "Сменить изображение"
+
+#: plugins/personal/generic/generic.tpl:48
+#, fuzzy
+msgid "Template name"
+msgstr "Шаблон"
+
 #: plugins/personal/generic/generic.tpl:67
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
@@ -2802,31 +2671,32 @@ msgid "Preferred langage"
 msgstr "Язык по умолчанию"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:88
+#: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/addons/godfs/class_dfsManagment.inc:217
 #: plugins/admin/fai/class_divListFai.inc:149
-#: plugins/admin/groups/generic.tpl:21
 #: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/groups/generic.tpl:21
 #: plugins/admin/users/class_divListUsers.inc:107
-#: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/applications/class_divListApplication.inc:104
-#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/server.tpl:14 plugins/admin/systems/terminal.tpl:17
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/systems/server.tpl:14 plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/phone.tpl:13
 #: plugins/admin/systems/class_divListSystem.inc:107
 #: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/servservice.tpl:61
 #: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/servservice.tpl:61 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
 #: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/ogroups/class_divListOGroup.inc:111
-#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
+#: plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/class_divListMacros.inc:85
-#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/macro/generic.tpl:20
 #: plugins/gofon/conference/class_divListConferences.inc:86
+#: plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr "Ветка"
 
@@ -2844,13 +2714,13 @@ msgstr "Выберите ветку для пользователя"
 #: plugins/admin/departments/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:36
 #: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
+#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
 #: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
+#: plugins/admin/systems/phone.tpl:19 plugins/admin/systems/phone.tpl:21
 #: plugins/admin/systems/workstation.tpl:29
 #: plugins/admin/systems/workstation.tpl:31
 #: plugins/admin/systems/component.tpl:19
-#: plugins/admin/systems/component.tpl:21 plugins/admin/systems/phone.tpl:19
-#: plugins/admin/systems/phone.tpl:21 plugins/admin/systems/printer.tpl:26
-#: plugins/admin/systems/printer.tpl:28
+#: plugins/admin/systems/component.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:27 plugins/admin/ogroups/generic.tpl:29
 #: plugins/gofon/macro/generic.tpl:27 plugins/gofon/macro/generic.tpl:29
@@ -2938,8 +2808,8 @@ msgid "Room No."
 msgstr "Номер комнаты"
 
 #: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
+#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Мобильный"
@@ -3012,31 +2882,6 @@ msgstr "Последняя доставка"
 msgid "Public visible"
 msgstr "Видимый всем"
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Удалить изображение"
-
-#: plugins/personal/generic/paste_generic.tpl:4
-#, fuzzy
-msgid "User settings"
-msgstr "Почтовые настройки пользователя"
-
-#: plugins/personal/generic/paste_generic.tpl:22
-#, fuzzy
-msgid "User picture"
-msgstr "Изображение"
-
-#: plugins/personal/generic/paste_generic.tpl:35
-#, fuzzy
-msgid "Clear password"
-msgstr "Новый пароль"
-
-#: plugins/personal/generic/paste_generic.tpl:36
-#, fuzzy
-msgid "Set new password"
-msgstr "Изменить пароль"
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Стандартный сертификат"
@@ -3053,107 +2898,255 @@ msgstr "Сертификат PKCS12"
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "Ð\92ам не Ñ\80азÑ\80еÑ\88ено менÑ\8fÑ\82Ñ\8c паÑ\80олÑ\8c."
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "женÑ\81кий"
 
-#: plugins/personal/generic/main.inc:189
-msgid "Generic user information"
-msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "мÑ\83жÑ\81кой"
 
-#: plugins/personal/connectivity/proxy.tpl:10
-msgid "Proxy account"
-msgstr "Ð\90ккаÑ\83нÑ\82 Proxy"
+#: plugins/personal/generic/class_user.inc:272
+msgid "This account has no valid GOsa extensions."
+msgstr "Ð\94лÑ\8f Ñ\8dÑ\82ой Ñ\83Ñ\87еÑ\82ной запиÑ\81и неÑ\82 коÑ\80Ñ\80екÑ\82нÑ\8bÑ\85 Ñ\80аÑ\81Ñ\88иÑ\80ений GOsa."
 
-#: plugins/personal/connectivity/proxy.tpl:18
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
+#: plugins/personal/generic/class_user.inc:326
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
-"ФилÑ\8cÑ\82Ñ\80оваÑ\82Ñ\8c нежелаÑ\82елÑ\8cное Ñ\81одеÑ\80жимое (напÑ\80имеÑ\80, поÑ\80ногÑ\80аÑ\84иÑ\87еÑ\81кое или "
-"связанное с насилием)"
+"УказаннÑ\8bй Ñ\84айл не бÑ\8bл загÑ\80Ñ\83жен на Ñ\81еÑ\80веÑ\80 (меÑ\82од HTTP POST)! Ð\9eпеÑ\80аÑ\86иÑ\8f "
+"прервана."
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Limit proxy access to working time"
-msgstr "Ð\9eгÑ\80аниÑ\87иÑ\82Ñ\8c доÑ\81Ñ\82Ñ\83п к пÑ\80окÑ\81и Ñ\80абоÑ\87им вÑ\80еменем"
+#: plugins/personal/generic/class_user.inc:422
+msgid "Please enter a valid serial number"
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "Ограничить квотой использование прокси"
+#: plugins/personal/generic/class_user.inc:459
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:86
-msgid "per"
-msgstr "per"
+#: plugins/personal/generic/class_user.inc:459
+msgid "valid"
+msgstr ""
 
-#: plugins/personal/connectivity/pptp.tpl:3
-#, fuzzy
-msgid "PPTP account"
-msgstr "Аккаунт FTP"
+#: plugins/personal/generic/class_user.inc:459
+msgid "invalid"
+msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/generic/class_user.inc:463
 #, fuzzy
-msgid "Intranet account"
-msgstr "Создать телефонный аккаунт"
-
-#: plugins/personal/connectivity/phpgw.tpl:3
-msgid "PHPGroupware account"
-msgstr "Учетная запись Groupware"
+msgid "No certificate installed"
+msgstr "Изменить сертификаты"
 
-#: plugins/personal/connectivity/glpi.tpl:1
-#, fuzzy
-msgid "GLPI account"
-msgstr "Аккаунт FTP"
+#: plugins/personal/generic/class_user.inc:546
+msgid "Removing generic user account failed"
+msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
+#: plugins/personal/generic/class_user.inc:835
+msgid "Saving generic user account failed"
+msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
-#, fuzzy
-msgid "Removing webDAV account failed"
-msgstr "Удалить телефонный аккаунт"
+#: plugins/personal/generic/class_user.inc:882
+msgid "Kerberos database communication failed"
+msgstr "Ошибка соединения с базой данных Kerberos"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
-#, fuzzy
-msgid "Saving webDAV account failed"
-msgstr "Учетная запись WebDAV"
+#: plugins/personal/generic/class_user.inc:899
+msgid "Can't remove user from kerberos database."
+msgstr "Не удается удалить пользователя из базы данных Kerberos."
 
-#: plugins/personal/connectivity/kolab.tpl:1
-#, fuzzy
-msgid "Kolab account"
-msgstr "Моя учетная запись"
+#: plugins/personal/generic/class_user.inc:910
+msgid "Can't add user to kerberos database."
+msgstr "Не удается добавить пользователя в базу данных Kerberos."
 
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
-msgstr ""
+#: plugins/personal/generic/class_user.inc:954
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/personal/connectivity/kolab.tpl:10
+#: plugins/personal/generic/class_user.inc:959
 #, fuzzy
-msgid "Delegations"
-msgstr "Ð\9dазнаÑ\87ение"
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f полÑ\8cзоваÑ\82елÑ\8f в Ñ\8dÑ\82ой веÑ\82ке."
 
-#: plugins/personal/connectivity/kolab.tpl:23
-#, fuzzy
-msgid "Mail size"
-msgstr "Размер квоты"
+#: plugins/personal/generic/class_user.inc:965
+#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/admin/users/class_userManagement.inc:517
+msgid "The required field 'Name' is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
+#: plugins/personal/generic/class_user.inc:974
+msgid "There's already a person with this 'Login' in the database."
 msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/personal/connectivity/kolab.tpl:32
-#, fuzzy
-msgid "Free Busy information"
-msgstr "Общая информация о пользователе"
+#: plugins/personal/generic/class_user.inc:980
+#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/admin/users/class_userManagement.inc:520
+msgid "The required field 'Given name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/personal/connectivity/kolab.tpl:35
-#: plugins/admin/systems/servRepositorySetup.tpl:24
-msgid "URL"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:983
+msgid "The required field 'Login' is not set."
+msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
 
-#: plugins/personal/connectivity/kolab.tpl:39
-msgid "Future"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:990
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Пользователь с такой комбинацией имени и личного имени в базе данных уже "
+"существует."
+
+#: plugins/personal/generic/class_user.inc:997
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
+"Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
+
+#: plugins/personal/generic/class_user.inc:1000
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
+
+#: plugins/personal/generic/class_user.inc:1003
+#: plugins/personal/generic/class_user.inc:1028
+#: plugins/addons/addressbook/class_addressbook.inc:556
+#: plugins/addons/addressbook/class_addressbook.inc:584
+#: plugins/admin/departments/class_departmentGeneric.inc:244
+msgid "The field 'Name' contains invalid characters."
+msgstr "Значение поля \"Имя\" содержит недопустимые символы."
+
+#: plugins/personal/generic/class_user.inc:1006
+#: plugins/personal/generic/class_user.inc:1025
+#: plugins/addons/addressbook/class_addressbook.inc:559
+#: plugins/addons/addressbook/class_addressbook.inc:581
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
+
+#: plugins/personal/generic/class_user.inc:1011
+#: plugins/addons/addressbook/class_addressbook.inc:564
+#: plugins/addons/addressbook/class_addressbook.inc:567
+#: plugins/admin/departments/class_departmentGeneric.inc:247
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1014
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/departments/class_departmentGeneric.inc:250
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1017
+#: plugins/addons/addressbook/class_addressbook.inc:573
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1020
+#: plugins/addons/addressbook/class_addressbook.inc:576
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1147
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "Невозможно выбрать базу данных!"
+
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "Вам не разрешено менять пароль."
+
+#: plugins/personal/generic/main.inc:189
+msgid "Generic user information"
+msgstr "Общая информация о пользователе"
+
+#: plugins/personal/connectivity/proxy.tpl:10
+msgid "Proxy account"
+msgstr "Аккаунт Proxy"
+
+#: plugins/personal/connectivity/proxy.tpl:18
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr ""
+"Фильтровать нежелательное содержимое (например, порнографическое или "
+"связанное с насилием)"
+
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Limit proxy access to working time"
+msgstr "Ограничить доступ к прокси рабочим временем"
+
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "Ограничить квотой использование прокси"
+
+#: plugins/personal/connectivity/proxy.tpl:86
+msgid "per"
+msgstr "per"
+
+#: plugins/personal/connectivity/pptp.tpl:3
+#, fuzzy
+msgid "PPTP account"
+msgstr "Аккаунт FTP"
+
+#: plugins/personal/connectivity/intranet.tpl:3
+#, fuzzy
+msgid "Intranet account"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#, fuzzy
+msgid "Removing webDAV account failed"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#, fuzzy
+msgid "Saving webDAV account failed"
+msgstr "Учетная запись WebDAV"
+
+#: plugins/personal/connectivity/phpgw.tpl:3
+msgid "PHPGroupware account"
+msgstr "Учетная запись Groupware"
+
+#: plugins/personal/connectivity/kolab.tpl:1
+#, fuzzy
+msgid "Kolab account"
+msgstr "Моя учетная запись"
+
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:10
+#, fuzzy
+msgid "Delegations"
+msgstr "Назначение"
+
+#: plugins/personal/connectivity/kolab.tpl:23
+#, fuzzy
+msgid "Mail size"
+msgstr "Размер квоты"
+
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:32
+#, fuzzy
+msgid "Free Busy information"
+msgstr "Общая информация о пользователе"
+
+#: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/admin/systems/servRepositorySetup.tpl:24
+msgid "URL"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
+msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:40
 #: plugins/personal/connectivity/oxchange.tpl:26
@@ -3220,6 +3213,11 @@ msgstr "Отметьте, чтобы отключить доступ к FTP"
 msgid "Temporary disable FTP access"
 msgstr "Временно отключить доступ к FTP"
 
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
+msgstr "Аккаунт FTP"
+
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr ""
@@ -3257,32 +3255,6 @@ msgstr "Информация"
 msgid "User Timezone"
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:1
-#, fuzzy
-msgid "Opengroupware"
-msgstr "Учетная запись Groupware"
-
-#: plugins/personal/connectivity/opengw.tpl:8
-#, fuzzy
-msgid "Location team"
-msgstr "Местоположение"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-#, fuzzy
-msgid "Template user"
-msgstr "Шаблон"
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:93
-#: plugins/admin/systems/class_servGeneric.inc:36
-#: plugins/admin/ogroups/class_termgroup.inc:39
-msgid "Locked"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr ""
-
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -3332,19 +3304,31 @@ msgstr "Значение поля \"Квота\" некорректно."
 msgid "Saving proxy account failed"
 msgstr "Аккаунт Proxy"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr ""
+#: plugins/personal/connectivity/opengw.tpl:1
+#, fuzzy
+msgid "Opengroupware"
+msgstr "Учетная запись Groupware"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/opengw.tpl:8
 #, fuzzy
-msgid "Removing intranet account failed"
-msgstr "УдалиÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
+msgid "Location team"
+msgstr "Ð\9cеÑ\81Ñ\82оположение"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/opengw.tpl:21
 #, fuzzy
-msgid "Saving intranet account failed"
-msgstr "Создать телефонный аккаунт"
+msgid "Template user"
+msgstr "Шаблон"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:93
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/ogroups/class_termgroup.inc:39
+msgid "Locked"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr ""
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
@@ -3360,48 +3344,28 @@ msgstr "Удалить настройки эл. почты"
 msgid "Saving PPTP account failed"
 msgstr "Аккаунт FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_intranetAccount.inc:102
 #, fuzzy
-msgid "Removing pureftpd account failed"
-msgstr "Удалить телефонный аккаунт"
+msgid "Removing intranet account failed"
+msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
+#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#, fuzzy
+msgid "Saving intranet account failed"
+msgstr "Создать телефонный аккаунт"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr "Значение поля \"Пропускная способность (с сервера)\" некорректно."
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
-msgid "Value specified as 'Files' is not valid."
-msgstr "Значение поля \"Файлы\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
-msgid "Value specified as 'Size' is not valid."
-msgstr "Значение поля \"Размер\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "Значение поля \"Отношение\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
-msgid "Saving pureftpd account failed"
-msgstr ""
-
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
-
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
-#, fuzzy
-msgid "Removing PHPgw account failed"
-msgstr "Удалить настройки эл. почты"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#, fuzzy
+msgid "Removing PHPgw account failed"
+msgstr "Удалить настройки эл. почты"
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:115
 msgid "Saving PHPgw account failed"
@@ -3481,9 +3445,39 @@ msgstr ""
 msgid "Saving Kolab account failed"
 msgstr "Моя учетная запись"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Учетная запись WebDAV"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#, fuzzy
+msgid "Removing pureftpd account failed"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "Значение поля \"Пропускная способность (с сервера)\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+msgid "Value specified as 'Files' is not valid."
+msgstr "Значение поля \"Файлы\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+msgid "Value specified as 'Size' is not valid."
+msgstr "Значение поля \"Размер\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "Значение поля \"Отношение\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+msgid "Saving pureftpd account failed"
+msgstr ""
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
@@ -3533,6 +3527,10 @@ msgstr ""
 msgid "Creating oxchange addressbook tree failed"
 msgstr ""
 
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Учетная запись WebDAV"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
 msgid "Opengroupware account"
@@ -3556,10 +3554,6 @@ msgid ""
 "configuration twice."
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:65
-msgid "This account has no connectivity extensions."
-msgstr "В этой учетной записи нет атрибутов для подключения."
-
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
 #, fuzzy
 msgid "PHPscheduleit"
@@ -3575,49 +3569,9 @@ msgstr "Учетная запись Groupware"
 msgid "Saving PHPscheduleit account failed"
 msgstr "Учетная запись Groupware"
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Список"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Имя стоп-листа"
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Выберите ветку стоп-листа"
-
-#: plugins/gofax/blocklists/generic.tpl:37
-#: plugins/admin/fai/class_faiSummaryTab.inc:329
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:47
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Тип"
-
-#: plugins/gofax/blocklists/generic.tpl:39
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
-
-#: plugins/gofax/blocklists/generic.tpl:48
-msgid "Descriptive text for this blocklist"
-msgstr "Описание стоп-листа"
-
-#: plugins/gofax/blocklists/generic.tpl:61
-msgid "Blocked numbers"
-msgstr "Блокируемые номера"
-
-#: plugins/gofax/blocklists/generic.tpl:77
-msgid "Numbers can also contain wild cards."
-msgstr "Вместо точных номеров можно использовать шаблоны."
+#: plugins/personal/connectivity/class_connectivity.inc:65
+msgid "This account has no connectivity extensions."
+msgstr "В этой учетной записи нет атрибутов для подключения."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
@@ -3673,44 +3627,6 @@ msgstr "Недостаточно прав для создания стоп-ли
 msgid "Saving blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.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_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:242 html/index.php:248 html/index.php:306
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-"сможет отменить результаты этой операции."
-
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10
-#: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
-#, fuzzy
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
-"нажмите <i>Отмена</i>."
-
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
-msgstr "Управление \"черными списками\""
-
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:32
 msgid "List of blocklists"
@@ -3740,8 +3656,8 @@ msgstr "Управление \"черными списками\""
 #: plugins/admin/applications/class_divListApplication.inc:45
 #: plugins/admin/departments/class_divListDepartment.inc:42
 #: plugins/admin/systems/class_divListSystem.inc:53
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/ogroups/class_divListOGroup.inc:54
 #: plugins/gofon/macro/class_divListMacros.inc:48
 #: plugins/gofon/conference/class_divListConferences.inc:49
@@ -3788,8 +3704,8 @@ msgstr "Регулярное выражение, соответствующее
 #: plugins/admin/applications/class_divListApplication.inc:92
 #: plugins/admin/departments/class_divListDepartment.inc:69
 #: plugins/admin/systems/class_divListSystem.inc:88
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/ogroups/class_divListOGroup.inc:99
 #: plugins/gofon/macro/class_divListMacros.inc:74
 #: plugins/gofon/conference/class_divListConferences.inc:75
@@ -3805,8 +3721,8 @@ msgstr "Список подразделений"
 #: plugins/admin/applications/class_divListApplication.inc:92
 #: plugins/admin/departments/class_divListDepartment.inc:69
 #: plugins/admin/systems/class_divListSystem.inc:88
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/ogroups/class_divListOGroup.inc:99
 #: plugins/gofon/macro/class_divListMacros.inc:74
 #: plugins/gofon/conference/class_divListConferences.inc:75
@@ -3821,8 +3737,8 @@ msgstr "Перезагрузить"
 #: plugins/admin/applications/class_divListApplication.inc:94
 #: plugins/admin/departments/class_divListDepartment.inc:70
 #: plugins/admin/systems/class_divListSystem.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/ogroups/class_divListOGroup.inc:101
 #: plugins/gofon/macro/class_divListMacros.inc:76
 #: plugins/gofon/conference/class_divListConferences.inc:77
@@ -3839,9 +3755,9 @@ msgstr "Подразделение"
 #: plugins/admin/applications/class_divListApplication.inc:94
 #: plugins/admin/departments/class_divListDepartment.inc:70
 #: plugins/admin/systems/class_divListSystem.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/ogroups/class_divListOGroup.inc:101
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_divListMacros.inc:76
@@ -3854,8 +3770,8 @@ msgstr ""
 #: plugins/admin/users/class_divListUsers.inc:97
 #: plugins/admin/applications/class_divListApplication.inc:96
 #: plugins/admin/systems/class_divListSystem.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/ogroups/class_divListOGroup.inc:103
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
@@ -3870,8 +3786,8 @@ msgstr "Выберите подразделение"
 #: plugins/admin/applications/class_divListApplication.inc:96
 #: plugins/admin/departments/class_divListDepartment.inc:71
 #: plugins/admin/systems/class_divListSystem.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/ogroups/class_divListOGroup.inc:103
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
@@ -3886,8 +3802,8 @@ msgstr "Имя системы"
 #: plugins/admin/applications/class_divListApplication.inc:98
 #: plugins/admin/departments/class_divListDepartment.inc:72
 #: plugins/admin/systems/class_divListSystem.inc:93
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/ogroups/class_divListOGroup.inc:105
 #: plugins/gofon/macro/class_divListMacros.inc:80
 #: plugins/gofon/conference/class_divListConferences.inc:81
@@ -3909,9 +3825,9 @@ msgstr ""
 #: plugins/admin/departments/class_divListDepartment.inc:77
 #: plugins/admin/systems/class_divListSystem.inc:93
 #: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/ogroups/class_divListOGroup.inc:105
 #: plugins/admin/ogroups/class_divListOGroup.inc:113
 #: plugins/gofon/macro/class_divListMacros.inc:80
@@ -3960,12 +3876,12 @@ msgstr "Показать подразделения"
 #: plugins/admin/users/class_divListUsers.inc:143
 #: plugins/admin/applications/class_divListApplication.inc:143
 #: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
 #: plugins/admin/systems/class_divListSystem.inc:135
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/macro/class_divListMacros.inc:102
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -4006,85 +3922,87 @@ msgstr "Удалить"
 msgid "Delete user"
 msgstr "Удалить"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:206
-#: plugins/addons/addressbook/address_info.tpl:88
-#: plugins/generic/references/class_reference.inc:30
-msgid "FAX"
-msgstr "Факс"
-
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:137
-msgid "This account has no fax extensions."
-msgstr "Для этой учетной записи нет расширений факса."
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Список"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
-msgid "Remove fax account"
-msgstr "УдалиÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки Ñ\84акÑ\81а"
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Ð\98мÑ\8f Ñ\81Ñ\82оп-лиÑ\81Ñ\82а"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:147
-msgid ""
-"This account has fax features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Выберите ветку стоп-листа"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:149
-msgid "Create fax account"
-msgstr "Создать настройки факса"
+#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/admin/fai/class_faiSummaryTab.inc:329
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Тип"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:150
-msgid ""
-"This account has fax features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+#: plugins/gofax/blocklists/generic.tpl:39
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:218
-msgid "You're trying to add an invalid phone number."
-msgstr "Ð\92Ñ\8b пÑ\8bÑ\82аеÑ\82еÑ\81Ñ\8c ввеÑ\81Ñ\82и некоÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+#: plugins/gofax/blocklists/generic.tpl:48
+msgid "Descriptive text for this blocklist"
+msgstr "Ð\9eпиÑ\81ание Ñ\81Ñ\82оп-лиÑ\81Ñ\82а"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
-#: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:627
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
-#, fuzzy
-msgid "back"
-msgstr "Назад"
+#: plugins/gofax/blocklists/generic.tpl:61
+msgid "Blocked numbers"
+msgstr "Блокируемые номера"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:625
-#, fuzzy
-msgid "Removing FAX account failed"
-msgstr "Удалить настройки эл. почты"
+#: plugins/gofax/blocklists/generic.tpl:77
+msgid "Numbers can also contain wild cards."
+msgstr "Вместо точных номеров можно использовать шаблоны."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
-msgid "The required field 'Fax' is not set."
-msgstr "Обязательное поле \"Факс\" не заполнено."
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.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/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:271 html/index.php:277 html/index.php:335
+#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+msgid "Warning"
+msgstr "Предупреждение"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
-msgid "Please enter a valid telephone number in the 'Fax' field."
-msgstr "Введите корректный номер телефона в поле \"Факс\"."
-
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
-msgid "Mail delivery is checked, but no address has been specified."
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
+"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
+"сможет отменить результаты этой операции."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:654
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10
+#: plugins/admin/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
 #, fuzzy
-msgid "The mail address you've entered is invalid."
-msgstr "Введенный вами адрес уже используется."
-
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
-msgid ""
-"Deliver fax to printer, is only possible if valid printer is given. Please "
-"correct your choice."
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
+"Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
+"нажмите <i>Отмена</i>."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
-msgid "Saving FAX account failed"
-msgstr ""
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Управление \"черными списками\""
 
 #: plugins/gofax/faxaccount/paste_generic.tpl:13
 #: plugins/gofax/faxaccount/generic.tpl:12
@@ -4188,6 +4106,86 @@ msgstr "Стоп-листы"
 msgid "FAX settings"
 msgstr "Настройки факса"
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
+#: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
+#: plugins/generic/references/class_reference.inc:30
+msgid "FAX"
+msgstr "Факс"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:137
+msgid "This account has no fax extensions."
+msgstr "Для этой учетной записи нет расширений факса."
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+msgid "Remove fax account"
+msgstr "Удалить настройки факса"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:147
+msgid ""
+"This account has fax features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:149
+msgid "Create fax account"
+msgstr "Создать настройки факса"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:150
+msgid ""
+"This account has fax features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:218
+msgid "You're trying to add an invalid phone number."
+msgstr "Вы пытаетесь ввести некорректный номер телефона."
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
+#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/admin/groups/class_groupApplication.inc:632
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#, fuzzy
+msgid "back"
+msgstr "Назад"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
+#, fuzzy
+msgid "Removing FAX account failed"
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
+msgid "The required field 'Fax' is not set."
+msgstr "Обязательное поле \"Факс\" не заполнено."
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
+msgid "Please enter a valid telephone number in the 'Fax' field."
+msgstr "Введите корректный номер телефона в поле \"Факс\"."
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
+msgid "Mail delivery is checked, but no address has been specified."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
+#, fuzzy
+msgid "The mail address you've entered is invalid."
+msgstr "Введенный вами адрес уже используется."
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
+msgid ""
+"Deliver fax to printer, is only possible if valid printer is given. Please "
+"correct your choice."
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:743
+msgid "Saving FAX account failed"
+msgstr ""
+
 #: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
 msgstr "Предварительный просмотр - пожалуйста, подождите"
@@ -4241,6 +4239,42 @@ msgstr "Время передачи"
 msgid "# pages"
 msgstr "Число страниц"
 
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
+msgstr "Отчеты о факсах"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:106
+#: plugins/gofax/faxreports/class_faxreport.inc:116
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:160
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:120
+#: plugins/gofax/faxreports/class_faxreport.inc:125
+msgid "Can't select fax database for report generation!"
+msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:148
+#: plugins/gofax/faxreports/class_faxreport.inc:263
+msgid "Query for fax database failed!"
+msgstr "Невозможно выполнить запрос к базе данных факсов!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:157
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr "У вас недостаточно прав для получения информации об этом факсе!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:271
+#: plugins/gofon/fonreports/class_fonreport.inc:202
+msgid "Y-M-D"
+msgstr "Г-М-Д"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4306,60 +4340,82 @@ msgstr "Получатель"
 msgid "Search returned no results..."
 msgstr "Не найдено..."
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
+#: plugins/gofax/faxreports/main.inc:18
+msgid "FAX reports"
 msgstr "Отчеты о факсах"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:106
-#: plugins/gofax/faxreports/class_faxreport.inc:116
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Соединение..."
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:160
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr "Звонок"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:120
-#: plugins/gofax/faxreports/class_faxreport.inc:125
-msgid "Can't select fax database for report generation!"
-msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Выбрать раздел, для хранения объекта"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:148
-#: plugins/gofax/faxreports/class_faxreport.inc:263
-msgid "Query for fax database failed!"
-msgstr "Ð\9dевозможно вÑ\8bполниÑ\82Ñ\8c запÑ\80оÑ\81 к базе даннÑ\8bÑ\85 Ñ\84акÑ\81ов!"
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Ð\9aонÑ\82акÑ\82"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:157
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr "У вас недостаточно прав для получения информации об этом факсе!"
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Отчество"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:271
-#: plugins/gofon/fonreports/class_fonreport.inc:202
-msgid "Y-M-D"
-msgstr "Ð\93-Ð\9c-Ð\94"
+#: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_info.tpl:29
+msgid "Private"
+msgstr "Ð\9bиÑ\87нÑ\8bй"
 
-#: plugins/gofax/faxreports/main.inc:18
-msgid "FAX reports"
-msgstr "Отчеты о факсах"
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Email"
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Организация"
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Компания"
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Город"
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Страна"
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
 #: plugins/admin/fai/class_faiSummaryTab.inc:324
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
-#: plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpi_devices.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:105
 #: plugins/admin/systems/glpi_devices.tpl:146
@@ -4373,19 +4429,14 @@ msgstr "Отчеты о факсах"
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Фамилия"
 
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:66
-#: plugins/addons/addressbook/address_info.tpl:29
-msgid "Private"
-msgstr "Личный"
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr "Контакт"
@@ -4406,7 +4457,7 @@ msgid "Add entry"
 msgstr "Добавить объект"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:709
+#: plugins/admin/groups/class_groupApplication.inc:714
 msgid "Edit entry"
 msgstr "Редактиовать объект"
 
@@ -4446,68 +4497,14 @@ msgstr "Выберите объект, в котором будет осущес
 msgid "Search string"
 msgstr "Строка поиска"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Соединение..."
-
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Звонок"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Выбрать раздел, для хранения объекта"
-
-#: plugins/addons/addressbook/address_edit.tpl:24
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Контакт"
-
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Отчество"
-
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Email"
-
-#: plugins/addons/addressbook/address_edit.tpl:119
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "Организация"
-
-#: plugins/addons/addressbook/address_edit.tpl:128
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Компания"
-
-#: plugins/addons/addressbook/address_edit.tpl:148
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Город"
-
-#: plugins/addons/addressbook/address_edit.tpl:168
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Страна"
-
-#: plugins/addons/addressbook/remove.tpl:6
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-"Это включает все объекты адресной книги. Проверте действительно ли это так, "
-"поскольку GOsa не сможет отменить результаты этой операции."
+#: plugins/addons/addressbook/remove.tpl:6
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"Это включает все объекты адресной книги. Проверте действительно ли это так, "
+"поскольку GOsa не сможет отменить результаты этой операции."
 
 #: plugins/addons/addressbook/main.inc:37
 msgid "Address book"
@@ -4621,8 +4618,122 @@ msgstr ""
 msgid "Saving addressbook entry failed"
 msgstr "Показать объекты адресной книги"
 
-#: plugins/addons/mailqueue/main.inc:38
+#: plugins/addons/godfs/class_dfsManagment.inc:10
+#, fuzzy
+msgid "DFS Managment"
+msgstr "Название"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:151
+#, fuzzy
+msgid "Removing DFS share failed"
+msgstr "Удалить сервис DNS"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#, fuzzy
+msgid "Go up one dfsshare"
+msgstr "Подразделение"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Создание нового объекта в"
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:102
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+#, fuzzy
+msgid "Dfs share already exists."
+msgstr "Подразделение с таким именем уже существует."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:117
+#, fuzzy
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:120
+#, fuzzy
+msgid "Required Field \"Description\" is not set."
+msgstr "Обязательное поле \"Описание\" не заполнено."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:123
+#, fuzzy
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:126
+#, fuzzy
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:129
+#, fuzzy
+msgid "Required Field \"Location\" is not set."
+msgstr "Обязательное поле \"Описание\" не заполнено."
+
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Свойства"
+
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Подразделение"
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Сервер"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Служба печати"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Местоположение"
+
+#: plugins/addons/godfs/contents.tpl:8
+#, fuzzy
+msgid "DFS Shares"
+msgstr "сброс"
+
+#: plugins/addons/godfs/contents.tpl:26
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"подразделения. Если у вас достаточно большое количество подразделений, вы "
+"можете использовать групповое выделение."
+
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Показать подходяшие адреса"
+
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Регулярное выражение, соответствующее именам систем"
+
+#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
+msgid "Distributed File System Administration"
+msgstr ""
+
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
+#: plugins/addons/mailqueue/main.inc:38
 #, fuzzy
 msgid "Mail queue"
 msgstr "Сервер"
@@ -5124,228 +5235,79 @@ msgstr "Сообщение"
 msgid "System log view"
 msgstr "Просмотр системного журнала"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:10
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:265
+#: plugins/admin/fai/class_faiHookEntry.inc:84
 #, fuzzy
-msgid "DFS Managment"
-msgstr "Ð\9dазвание"
+msgid "Download"
+msgstr "Ð\94омен"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:151
+#: plugins/admin/fai/class_faiScript.inc:303
+msgid "Removing FAI script base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:354
 #, fuzzy
-msgid "Removing DFS share failed"
-msgstr "УдалиÑ\82Ñ\8c Ñ\81еÑ\80виÑ\81 DNS"
+msgid "Creating FAI script base failed"
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:170
-msgid "No DFS entries found"
-msgstr ""
+#: plugins/admin/fai/class_faiScript.inc:424
+#, fuzzy
+msgid "Removing FAI script failed"
+msgstr "Атрибуты UNIX"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/fai/class_faiScript.inc:443
 #, fuzzy
-msgid "Go up one dfsshare"
-msgstr "Ð\9fодÑ\80азделение"
+msgid "Saving FAI script failed"
+msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82Ñ\8b UNIX"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-msgid "Go to dfs root"
+#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
+#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
+#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
+#: plugins/admin/fai/tabsTemplate.inc:34
+#: plugins/admin/departments/tabs_department.inc:31
+msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsManagment.inc:215
+#: plugins/admin/fai/class_faiTemplate.inc:325
 #, fuzzy
-msgid "Create new dfsshare"
-msgstr "Создание нового обÑ\8aекÑ\82а в"
+msgid "Saving FAI template base failed"
+msgstr "СпиÑ\81ок подÑ\80азделений"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:102
-#: plugins/addons/godfs/class_dfsgeneric.inc:104
-#, fuzzy
-msgid "Dfs share already exists."
-msgstr "Подразделение с таким именем уже существует."
+#: plugins/admin/fai/class_faiTemplate.inc:386
+msgid "Removing FAI template base failed"
+msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:117
+#: plugins/admin/fai/class_faiTemplate.inc:391
+#: plugins/admin/fai/class_faiTemplate.inc:404
 #, fuzzy
-msgid "Required Field \"Name of dfs Share\" is not set."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\98мÑ\8f\" не заполнено."
+msgid "Saving FAI template failed"
+msgstr "СпиÑ\81ок подÑ\80азделений"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:120
+#: plugins/admin/fai/class_faiManagement.inc:32
 #, fuzzy
-msgid "Required Field \"Description\" is not set."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eпиÑ\81ание\" не заполнено."
+msgid "FAI"
+msgstr "Ð\98денÑ\82иÑ\84икаÑ\82оÑ\80 Ñ\84акÑ\81а"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:123
+#: plugins/admin/fai/class_faiManagement.inc:33
 #, fuzzy
-msgid "Required Field \"Fileserver\" is not set."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\98мÑ\8f\" не заполнено."
+msgid "Fully Automatic Installation - management"
+msgstr "УпÑ\80авление пÑ\80иложениÑ\8fми"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:126
-#, fuzzy
-msgid "Required Field \"Share on fileserver\" is not set."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\98мÑ\8f\" не заполнено."
+#: plugins/admin/fai/class_faiManagement.inc:153
+#, fuzzy, php-format
+msgid "You're about to delete all information about the FAI class at '%s'."
+msgstr "Ð\92Ñ\8b Ñ\81обиÑ\80аеÑ\82еÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c вÑ\81Ñ\8e инÑ\84оÑ\80маÑ\86иÑ\8e о Ñ\82еÑ\80минале (\"%s\")."
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:129
+#: plugins/admin/fai/class_faiManagement.inc:159
+#: plugins/admin/fai/class_faiManagement.inc:202
+#: plugins/admin/systems/class_systemManagement.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:373
 #, fuzzy
-msgid "Required Field \"Location\" is not set."
-msgstr "Обязательное поле \"Описание\" не заполнено."
-
-#: plugins/addons/godfs/contents.tpl:8
-#, fuzzy
-msgid "DFS Shares"
-msgstr "сброс"
-
-#: plugins/addons/godfs/contents.tpl:26
-#, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected dfs shares. Having "
-"a large numbers of dfs shares, you might prefer the range selectors on top "
-"of the dfs share list."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"подразделения. Если у вас достаточно большое количество подразделений, вы "
-"можете использовать групповое выделение."
-
-#: plugins/addons/godfs/contents.tpl:40
-#, fuzzy
-msgid "Display dfs shares matching"
-msgstr "Показать подходяшие адреса"
-
-#: plugins/addons/godfs/contents.tpl:44
-#, fuzzy
-msgid "Regular expression for matching dfs share names"
-msgstr "Регулярное выражение, соответствующее именам систем"
-
-#: plugins/addons/godfs/generic.tpl:4
-#, fuzzy
-msgid "DFS Properties"
-msgstr "Свойства"
-
-#: plugins/addons/godfs/generic.tpl:8
-#, fuzzy
-msgid "Name of dfs Share"
-msgstr "Подразделение"
-
-#: plugins/addons/godfs/generic.tpl:16
-#, fuzzy
-msgid "Fileserver"
-msgstr "Сервер"
-
-#: plugins/addons/godfs/generic.tpl:20
-#, fuzzy
-msgid "Share on Fileserver"
-msgstr "Служба печати"
-
-#: plugins/addons/godfs/generic.tpl:30
-#, fuzzy
-msgid "DFS Location"
-msgstr "Местоположение"
-
-#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
-msgid "Distributed File System Administration"
-msgstr ""
-
-#: plugins/admin/fai/class_faiScript.inc:241
-#: plugins/admin/fai/class_faiTemplate.inc:214
-#: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:265
-#: plugins/admin/fai/class_faiHookEntry.inc:84
-#, fuzzy
-msgid "Download"
-msgstr "Домен"
-
-#: plugins/admin/fai/class_faiScript.inc:303
-msgid "Removing FAI script base failed"
-msgstr ""
-
-#: plugins/admin/fai/class_faiScript.inc:354
-#, fuzzy
-msgid "Creating FAI script base failed"
-msgstr "Объект группы"
-
-#: plugins/admin/fai/class_faiScript.inc:424
-#, fuzzy
-msgid "Removing FAI script failed"
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/fai/class_faiScript.inc:443
-#, fuzzy
-msgid "Saving FAI script failed"
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
-#, fuzzy
-msgid "Objects"
-msgstr "Объект"
-
-#: plugins/admin/fai/faiVariable.tpl:34
-#, fuzzy
-msgid "List of assigned variables"
-msgstr "Выберите тип мыши"
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
-#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
-#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
-#: plugins/admin/fai/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
-#: plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/departments/tabs_department.inc:31
-msgid "Try to move tree failed. Destination tree is subtree of source tree."
-msgstr ""
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-#, fuzzy
-msgid "Please enter your search string here"
-msgstr "Введите корректный серийный номер"
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
-msgstr ""
-
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
-msgstr ""
-
-#: plugins/admin/fai/class_faiTemplate.inc:325
-#, fuzzy
-msgid "Saving FAI template base failed"
-msgstr "Список подразделений"
-
-#: plugins/admin/fai/class_faiTemplate.inc:386
-msgid "Removing FAI template base failed"
-msgstr ""
-
-#: plugins/admin/fai/class_faiTemplate.inc:391
-#: plugins/admin/fai/class_faiTemplate.inc:404
-#, fuzzy
-msgid "Saving FAI template failed"
-msgstr "Список подразделений"
-
-#: plugins/admin/fai/class_faiManagement.inc:32
-#, fuzzy
-msgid "FAI"
-msgstr "Идентификатор факса"
-
-#: plugins/admin/fai/class_faiManagement.inc:33
-#, fuzzy
-msgid "Fully Automatic Installation - management"
-msgstr "Управление приложениями"
-
-#: plugins/admin/fai/class_faiManagement.inc:153
-#, fuzzy, php-format
-msgid "You're about to delete all information about the FAI class at '%s'."
-msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
-
-#: plugins/admin/fai/class_faiManagement.inc:159
-#: plugins/admin/fai/class_faiManagement.inc:202
-#: plugins/admin/systems/class_systemManagement.inc:313
-#: plugins/admin/systems/class_systemManagement.inc:373
-#, fuzzy
-msgid "You are not allowed to delete this component!"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
+msgid "You are not allowed to delete this component!"
+msgstr "У вас недостаточно прав для удаления этого объекта!"
 
 #: plugins/admin/fai/class_faiManagement.inc:255
 #, fuzzy, php-format
@@ -5368,8 +5330,8 @@ msgid "Specified freeze name is invalid."
 msgstr "Указанное имя уже используется."
 
 #: plugins/admin/fai/class_faiManagement.inc:322
-#: plugins/admin/systems/class_servRepository.inc:208
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
+#: plugins/admin/systems/class_servRepository.inc:208
 #, fuzzy
 msgid "This name is already in use."
 msgstr "Указанное имя уже используется."
@@ -5384,22 +5346,70 @@ msgstr "Указанное имя уже используется."
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
 #: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
 msgid "Continue"
 msgstr "Продолжить"
 
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+#, fuzzy
+msgid "Please enter your search string here"
+msgstr "Введите корректный серийный номер"
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:3
+#: plugins/admin/applications/release_select.tpl:3
+#, fuzzy
+msgid "Branches"
+msgstr "Отмена"
+
+#: plugins/admin/fai/branch_selector.tpl:9
+#: plugins/admin/applications/release_select.tpl:9
+#, fuzzy
+msgid "Current release"
+msgstr "Текущий пароль"
+
+#: plugins/admin/fai/branch_selector.tpl:21
+#, fuzzy
+msgid "Create new branch"
+msgstr "Создание нового объекта в"
+
+#: plugins/admin/fai/branch_selector.tpl:25
+#, fuzzy
+msgid "Create new locked branch"
+msgstr "Создание нового объекта в"
+
+#: plugins/admin/fai/branch_selector.tpl:30
+#, fuzzy
+msgid "Delete current release"
+msgstr "Удалить"
+
 #: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
 #, fuzzy
 msgid "Fully Automatic Installation"
 msgstr "Управление приложениями"
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
+#: plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
 #, fuzzy
-msgid "Package"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82елеÑ\84онÑ\8b"
+msgid "Objects"
+msgstr "Ð\9eбÑ\8aекÑ\82"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 #, fuzzy
@@ -5464,20 +5474,10 @@ msgstr "Показать совпадения объектов"
 msgid "Regular expression for matching object names"
 msgstr "Регулярное выражение, соответствующее именам объектов"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#, fuzzy
-msgid "Device"
-msgstr "Устройства"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-#, fuzzy
-msgid "Partition entries"
-msgstr "Переменная"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #, fuzzy
-msgid "Add partition"
-msgstr "Ð\94обавиÑ\82Ñ\8c паÑ\80амеÑ\82Ñ\80"
+msgid "Package"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82елеÑ\84онÑ\8b"
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:39
 #, fuzzy
@@ -5557,6 +5557,15 @@ msgstr "Введите адрес сервера"
 msgid "Please enter a script."
 msgstr "Введите корректный серийный номер"
 
+#: plugins/admin/fai/faiVariable.tpl:34
+#, fuzzy
+msgid "List of assigned variables"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
 #: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/admin/groups/class_divListGroup.inc:50
 #: plugins/admin/users/class_divListUsers.inc:51
@@ -5619,9 +5628,10 @@ msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
-#: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:248
+#: plugins/admin/systems/workstationStartup.tpl:45
+#: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:248
 #, fuzzy
 msgid "Release"
 msgstr "Набор правил"
@@ -5647,7 +5657,7 @@ msgstr "Показать телефоны"
 msgid "Choosen packages"
 msgstr "Показать телефоны"
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:575
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:669
 msgid "Configure"
 msgstr "Настроить"
 
@@ -5739,32 +5749,10 @@ msgstr ""
 msgid "FAI classes"
 msgstr "Выберите тип мыши"
 
-#: plugins/admin/fai/remove.tpl:7
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 #, fuzzy
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
-"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
-"результаты этой операции."
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-#, fuzzy
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
-"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
-"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
-#, fuzzy
-msgid "FS type"
-msgstr "Тип"
+msgid "FS type"
+msgstr "Тип"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
 #, fuzzy
@@ -5820,6 +5808,21 @@ msgid ""
 "please check your configuration twice."
 msgstr ""
 
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#, fuzzy
+msgid "Device"
+msgstr "Устройства"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#, fuzzy
+msgid "Partition entries"
+msgstr "Переменная"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#, fuzzy
+msgid "Add partition"
+msgstr "Добавить параметр"
+
 #: plugins/admin/fai/faiScript.tpl:34
 #, fuzzy
 msgid "List of scripts"
@@ -5859,7 +5862,7 @@ msgstr ""
 msgid "please choose a release..."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/admin/fai/faiPackageNew.tpl:31 plugins/admin/systems/network.tpl:36
+#: plugins/admin/fai/faiPackageNew.tpl:31 plugins/admin/systems/network.tpl:42
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/gofon/phoneaccount/generic.tpl:67
 #, fuzzy
@@ -5945,6 +5948,200 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
+#: plugins/admin/fai/class_divListFai.inc:43
+#, fuzzy
+msgid "List of FAI classes"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/fai/class_divListFai.inc:44
+msgid "This table displays all systems, in the selected tree."
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:48
+msgid "This menu allows you to create, delete and edit FAI classes."
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:58
+#, fuzzy
+msgid "Name of FAI class"
+msgstr "Имя стоп-листа"
+
+#: plugins/admin/fai/class_divListFai.inc:59
+msgid "Class type"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:62
+msgid "Display FAI profile objects"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:62
+#, fuzzy
+msgid "Show profiles"
+msgstr "Показать принтеры"
+
+#: plugins/admin/fai/class_divListFai.inc:63
+#, fuzzy
+msgid "Display FAI template objects"
+msgstr "Список подразделений"
+
+#: plugins/admin/fai/class_divListFai.inc:63
+#: plugins/admin/users/class_divListUsers.inc:54
+msgid "Show templates"
+msgstr "Показать шаблоны"
+
+#: plugins/admin/fai/class_divListFai.inc:64
+#, fuzzy
+msgid "Display FAI scripts"
+msgstr "Список пользователей"
+
+#: plugins/admin/fai/class_divListFai.inc:64
+#, fuzzy
+msgid "Show scripts"
+msgstr "Показать хосты"
+
+#: plugins/admin/fai/class_divListFai.inc:65
+#, fuzzy
+msgid "Display FAI hooks"
+msgstr "Ошибка LDAP:"
+
+#: plugins/admin/fai/class_divListFai.inc:65
+#, fuzzy
+msgid "Show hooks"
+msgstr "Показать хосты"
+
+#: plugins/admin/fai/class_divListFai.inc:66
+#, fuzzy
+msgid "Display FAI variables"
+msgstr "Устройство отображения"
+
+#: plugins/admin/fai/class_divListFai.inc:66
+#, fuzzy
+msgid "Show variables"
+msgstr "Показать терминалы"
+
+#: plugins/admin/fai/class_divListFai.inc:67
+#, fuzzy
+msgid "Display FAI packages"
+msgstr "Отображаемое имя"
+
+#: plugins/admin/fai/class_divListFai.inc:67
+#, fuzzy
+msgid "Show packages"
+msgstr "Показать телефоны"
+
+#: plugins/admin/fai/class_divListFai.inc:68
+#, fuzzy
+msgid "Display FAI partitions"
+msgstr "Показать рабочие станции"
+
+#: plugins/admin/fai/class_divListFai.inc:68
+#, fuzzy
+msgid "Show partitions"
+msgstr "Показать рабочие станции"
+
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/departments/class_divListDepartment.inc:71
+#, fuzzy
+msgid "Go to users home department"
+msgstr "Подразделение"
+
+#: plugins/admin/fai/class_divListFai.inc:125
+#, fuzzy
+msgid "New profile"
+msgstr "Управление системами"
+
+#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "P"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:130
+#, fuzzy
+msgid "New partition table"
+msgstr "Принтер"
+
+#: plugins/admin/fai/class_divListFai.inc:130
+msgid "PT"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:133
+#, fuzzy
+msgid "New scripts"
+msgstr "Показать хосты"
+
+#: plugins/admin/fai/class_divListFai.inc:133
+msgid "S"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:136
+#, fuzzy
+msgid "New hooks"
+msgstr "Показать хосты"
+
+#: plugins/admin/fai/class_divListFai.inc:136
+msgid "H"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:139
+#, fuzzy
+msgid "New variables"
+msgstr "Показать терминалы"
+
+#: plugins/admin/fai/class_divListFai.inc:139
+msgid "V"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:142
+#, fuzzy
+msgid "New templates"
+msgstr "Создать шаблон"
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "T"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:145
+#, fuzzy
+msgid "New package list"
+msgstr "Число страниц"
+
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "PK"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:210
+#: plugins/admin/fai/class_divListFai.inc:215
+#, fuzzy
+msgid "Edit class"
+msgstr "Список систем"
+
+#: plugins/admin/fai/class_divListFai.inc:217
+#, fuzzy
+msgid "Delete class"
+msgstr "Удалить"
+
+#: plugins/admin/fai/remove.tpl:7
+#, fuzzy
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
+"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
+"результаты этой операции."
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+#, fuzzy
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
+"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
+"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
+
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
 #: plugins/admin/fai/class_faiPartitionTable.inc:275
 #, fuzzy, php-format
@@ -6012,6 +6209,11 @@ msgstr ""
 msgid "Choose an existing FAI task"
 msgstr ""
 
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr ""
+
 #: plugins/admin/fai/class_faiVariable.inc:294
 msgid "Saving FAI variable base failed"
 msgstr ""
@@ -6025,11 +6227,6 @@ msgstr ""
 msgid "Saving FAI variable failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr ""
-
 #: plugins/admin/fai/class_askClassName.inc:81
 #, fuzzy
 msgid "Create new FAI object - partition table."
@@ -6110,11 +6307,11 @@ msgstr "Выберите тип мыши"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #: plugins/admin/systems/glpiDeviceManagement.tpl:51
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
-#: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #, fuzzy
 msgid "Use"
 msgstr "Пользователь"
@@ -6287,204 +6484,44 @@ msgstr "Состояние"
 msgid "List of hook scripts"
 msgstr "Стоп-листы"
 
-#: plugins/admin/fai/branch_selector.tpl:3
-#: plugins/admin/applications/release_select.tpl:3
-#, fuzzy
-msgid "Branches"
-msgstr "Отмена"
+#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "Основной адрес эл. почты для этой общей папки"
 
-#: plugins/admin/fai/branch_selector.tpl:9
-#: plugins/admin/applications/release_select.tpl:9
-#, fuzzy
-msgid "Current release"
-msgstr "Текущий пароль"
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr "Выберите почтовый сервер для пользователя"
 
-#: plugins/admin/fai/branch_selector.tpl:21
-#, fuzzy
-msgid "Create new branch"
-msgstr "Создание нового объекта в"
-
-#: plugins/admin/fai/branch_selector.tpl:25
-#, fuzzy
-msgid "Create new locked branch"
-msgstr "Создание нового объекта в"
-
-#: plugins/admin/fai/branch_selector.tpl:30
-#, fuzzy
-msgid "Delete current release"
-msgstr "Удалить"
-
-#: plugins/admin/fai/class_divListFai.inc:43
-#, fuzzy
-msgid "List of FAI classes"
-msgstr "Выберите тип мыши"
-
-#: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:48
-msgid "This menu allows you to create, delete and edit FAI classes."
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:58
-#, fuzzy
-msgid "Name of FAI class"
-msgstr "Имя стоп-листа"
-
-#: plugins/admin/fai/class_divListFai.inc:59
-msgid "Class type"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:62
-msgid "Display FAI profile objects"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:62
-#, fuzzy
-msgid "Show profiles"
-msgstr "Показать принтеры"
-
-#: plugins/admin/fai/class_divListFai.inc:63
-#, fuzzy
-msgid "Display FAI template objects"
-msgstr "Список подразделений"
-
-#: plugins/admin/fai/class_divListFai.inc:63
-#: plugins/admin/users/class_divListUsers.inc:54
-msgid "Show templates"
-msgstr "Показать шаблоны"
-
-#: plugins/admin/fai/class_divListFai.inc:64
-#, fuzzy
-msgid "Display FAI scripts"
-msgstr "Список пользователей"
-
-#: plugins/admin/fai/class_divListFai.inc:64
-#, fuzzy
-msgid "Show scripts"
-msgstr "Показать хосты"
-
-#: plugins/admin/fai/class_divListFai.inc:65
-#, fuzzy
-msgid "Display FAI hooks"
-msgstr "Ошибка LDAP:"
-
-#: plugins/admin/fai/class_divListFai.inc:65
-#, fuzzy
-msgid "Show hooks"
-msgstr "Показать хосты"
-
-#: plugins/admin/fai/class_divListFai.inc:66
-#, fuzzy
-msgid "Display FAI variables"
-msgstr "Устройство отображения"
-
-#: plugins/admin/fai/class_divListFai.inc:66
-#, fuzzy
-msgid "Show variables"
-msgstr "Показать терминалы"
-
-#: plugins/admin/fai/class_divListFai.inc:67
-#, fuzzy
-msgid "Display FAI packages"
-msgstr "Отображаемое имя"
-
-#: plugins/admin/fai/class_divListFai.inc:67
-#, fuzzy
-msgid "Show packages"
-msgstr "Показать телефоны"
-
-#: plugins/admin/fai/class_divListFai.inc:68
-#, fuzzy
-msgid "Display FAI partitions"
-msgstr "Показать рабочие станции"
-
-#: plugins/admin/fai/class_divListFai.inc:68
-#, fuzzy
-msgid "Show partitions"
-msgstr "Показать рабочие станции"
-
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:71
-#, fuzzy
-msgid "Go to users home department"
-msgstr "Подразделение"
-
-#: plugins/admin/fai/class_divListFai.inc:125
-#, fuzzy
-msgid "New profile"
-msgstr "Управление системами"
-
-#: plugins/admin/fai/class_divListFai.inc:125
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "P"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:130
-#, fuzzy
-msgid "New partition table"
-msgstr "Принтер"
-
-#: plugins/admin/fai/class_divListFai.inc:130
-msgid "PT"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:133
-#, fuzzy
-msgid "New scripts"
-msgstr "Показать хосты"
-
-#: plugins/admin/fai/class_divListFai.inc:133
-msgid "S"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:136
-#, fuzzy
-msgid "New hooks"
-msgstr "Показать хосты"
-
-#: plugins/admin/fai/class_divListFai.inc:136
-msgid "H"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:139
-#, fuzzy
-msgid "New variables"
-msgstr "Показать терминалы"
-
-#: plugins/admin/fai/class_divListFai.inc:139
-msgid "V"
-msgstr ""
+#: plugins/admin/groups/mail.tpl:63
+msgid "IMAP shared folders"
+msgstr "Общие папки IMAP"
 
-#: plugins/admin/fai/class_divListFai.inc:142
-#, fuzzy
-msgid "New templates"
-msgstr "Создать шаблон"
+#: plugins/admin/groups/mail.tpl:67
+msgid "Default permission"
+msgstr "Права по умолчанию"
 
-#: plugins/admin/fai/class_divListFai.inc:142
-msgid "T"
-msgstr ""
+#: plugins/admin/groups/mail.tpl:76
+msgid "Member permission"
+msgstr "Права для членов группы"
 
-#: plugins/admin/fai/class_divListFai.inc:145
-#, fuzzy
-msgid "New package list"
-msgstr "Число страниц"
+#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
+msgid "Forward messages to non group members"
+msgstr "Пересылать сообщения не членам группы"
 
-#: plugins/admin/fai/class_divListFai.inc:145
-msgid "PK"
-msgstr ""
+#: plugins/admin/groups/class_groupManagement.inc:25 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
+msgstr "Группы"
 
-#: plugins/admin/fai/class_divListFai.inc:210
-#: plugins/admin/fai/class_divListFai.inc:215
-#, fuzzy
-msgid "Edit class"
-msgstr "Список систем"
+#: plugins/admin/groups/class_groupManagement.inc:244
+#, php-format
+msgid "You're about to delete the group '%s'."
+msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/admin/fai/class_divListFai.inc:217
-#, fuzzy
-msgid "Delete class"
-msgstr "Удалить"
+#: plugins/admin/groups/class_groupManagement.inc:250
+#: plugins/admin/groups/class_groupManagement.inc:281
+msgid "You are not allowed to delete this group!"
+msgstr "У вас недостаточно прав для удаления этой группы!"
 
 #: plugins/admin/groups/class_groupGeneric.inc:123
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
@@ -6563,126 +6600,42 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "Группа с таким именем уже существует."
 
-#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "Основной адрес эл. почты для этой общей папки"
+#: plugins/admin/groups/class_divListGroup.inc:35
+#: plugins/admin/groups/class_divListGroup.inc:36
+msgid "List of groups"
+msgstr "Список групп"
 
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
-msgstr "Выберите почтовый сервер для пользователя"
+#: plugins/admin/groups/class_divListGroup.inc:41
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"группы пользователей. Если у вас их достаточно большое количество, вы можете "
+"использовать групповое выделение."
 
-#: plugins/admin/groups/mail.tpl:63
-msgid "IMAP shared folders"
-msgstr "Общие папки IMAP"
+#: plugins/admin/groups/class_divListGroup.inc:49
+#, fuzzy
+msgid "Groupname / Department"
+msgstr "Подразделение"
 
-#: plugins/admin/groups/mail.tpl:67
-msgid "Default permission"
-msgstr "Ð\9fÑ\80ава по Ñ\83молÑ\87аниÑ\8e"
+#: plugins/admin/groups/class_divListGroup.inc:54
+msgid "Select to see groups that are primary groups of users"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е, Ñ\87Ñ\82обÑ\8b пÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\81пиÑ\81ок оÑ\81новнÑ\8bÑ\85 гÑ\80Ñ\83пп полÑ\8cзоваÑ\82елей"
 
-#: plugins/admin/groups/mail.tpl:76
-msgid "Member permission"
-msgstr "Права для членов группы"
+#: plugins/admin/groups/class_divListGroup.inc:54
+msgid "Show primary groups"
+msgstr "Показать основные группы"
 
-#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
-msgid "Forward messages to non group members"
-msgstr "Ð\9fеÑ\80еÑ\81Ñ\8bлаÑ\82Ñ\8c Ñ\81ообÑ\89ениÑ\8f не Ñ\87ленам гÑ\80Ñ\83ппÑ\8b"
+#: plugins/admin/groups/class_divListGroup.inc:55
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е, Ñ\87Ñ\82обÑ\8b пÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c гÑ\80Ñ\83ппÑ\8b, коÑ\82оÑ\80Ñ\8bе вÑ\85одÑ\8fÑ\82 в samba"
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/generic.tpl:7
-msgid "Group name"
-msgstr "Группа"
-
-#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
-msgid "Posix name of the group"
-msgstr "Имя группы, соответствующее стандарту POSIX"
-
-#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
-msgid "Descriptive text for this group"
-msgstr "Описание группы"
-
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
-msgid "Choose subtree to place group in"
-msgstr "Выберите ветку для группы"
-
-#: plugins/admin/groups/generic.tpl:41
-#: plugins/admin/groups/paste_generic.tpl:13
-msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Обычно идентификаторы создаются автоматически, но вы можете выбрать указание "
-"вручную"
-
-#: plugins/admin/groups/generic.tpl:41
-#: plugins/admin/groups/paste_generic.tpl:15
-msgid "Force GID"
-msgstr "Указать GID вручную"
-
-#: plugins/admin/groups/generic.tpl:43
-#: plugins/admin/groups/paste_generic.tpl:18
-msgid "Forced ID number"
-msgstr "Указанный вручную GID"
-
-#: plugins/admin/groups/generic.tpl:50
-msgid "Select to create a samba conform group"
-msgstr "Создать группу для работы с Samba"
-
-#: plugins/admin/groups/generic.tpl:55
-msgid "in domain"
-msgstr "в домене"
-
-#: plugins/admin/groups/generic.tpl:72
-msgid "Members are in a phone pickup group"
-msgstr "Члены телефонной группы"
-
-#: plugins/admin/groups/generic.tpl:85
-#, fuzzy
-msgid "Members are in a nagios group"
-msgstr "Члены телефонной группы"
-
-#: plugins/admin/groups/generic.tpl:101
-msgid "Group members"
-msgstr "Члены группы"
-
-#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
-msgid "Group administration"
-msgstr "Управление группами"
-
-#: plugins/admin/groups/class_divListGroup.inc:35
-#: plugins/admin/groups/class_divListGroup.inc:36
-msgid "List of groups"
-msgstr "Список групп"
-
-#: plugins/admin/groups/class_divListGroup.inc:41
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"группы пользователей. Если у вас их достаточно большое количество, вы можете "
-"использовать групповое выделение."
-
-#: plugins/admin/groups/class_divListGroup.inc:49
-#, fuzzy
-msgid "Groupname / Department"
-msgstr "Подразделение"
-
-#: plugins/admin/groups/class_divListGroup.inc:54
-msgid "Select to see groups that are primary groups of users"
-msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
-
-#: plugins/admin/groups/class_divListGroup.inc:54
-msgid "Show primary groups"
-msgstr "Показать основные группы"
-
-#: plugins/admin/groups/class_divListGroup.inc:55
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Выберите, чтобы просмотреть группы, которые входят в samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:55
-msgid "Show samba groups"
-msgstr "Показать группы samba"
+#: plugins/admin/groups/class_divListGroup.inc:55
+msgid "Show samba groups"
+msgstr "Показать группы samba"
 
 #: plugins/admin/groups/class_divListGroup.inc:56
 msgid "Select to see groups that have applications configured"
@@ -6787,6 +6740,10 @@ msgstr ""
 "действительно хотите удалить ее, так как GOsa не сможет отменить результаты "
 "этой операции."
 
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
+msgid "Group administration"
+msgstr "Управление группами"
+
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid "read"
 msgstr "чтение"
@@ -6857,6 +6814,29 @@ msgstr "Выбрать"
 msgid "Apply this acl only for users own entries"
 msgstr "Применить эти права доступа только к собственным записям пользователей"
 
+#: plugins/admin/groups/application.tpl:3
+#, fuzzy
+msgid "Release focus"
+msgstr "Набор правил"
+
+#: plugins/admin/groups/application.tpl:5
+#, fuzzy
+msgid "Select release name"
+msgstr "Выберите, чтобы просмотреть серверы"
+
+#: plugins/admin/groups/application.tpl:16
+msgid "Used applications"
+msgstr "Используемые приложения"
+
+#: plugins/admin/groups/application.tpl:19
+#, fuzzy
+msgid "Add category"
+msgstr "Категория"
+
+#: plugins/admin/groups/application.tpl:24
+msgid "Available applications"
+msgstr "Доступные приложения"
+
 #: plugins/admin/groups/group_objects.tpl:6
 msgid "Select users to add"
 msgstr "Выбрать пользователей для добавления"
@@ -6881,37 +6861,37 @@ msgstr "Подразделение"
 msgid "Regular expression for matching user names"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
-#: plugins/admin/groups/application.tpl:3
-#, fuzzy
-msgid "Release focus"
-msgstr "Набор правил"
-
-#: plugins/admin/groups/application.tpl:5
+#: plugins/admin/groups/paste_generic.tpl:1
 #, fuzzy
-msgid "Select release name"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е, Ñ\87Ñ\82обÑ\8b пÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\81еÑ\80веÑ\80Ñ\8b"
+msgid "Group settings"
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Samba"
 
-#: plugins/admin/groups/application.tpl:16
-msgid "Used applications"
-msgstr "Используемые приложения"
+#: plugins/admin/groups/paste_generic.tpl:5 plugins/admin/groups/generic.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/generic.tpl:7
+msgid "Group name"
+msgstr "Группа"
 
-#: plugins/admin/groups/application.tpl:19
-#, fuzzy
-msgid "Add category"
-msgstr "Категория"
+#: plugins/admin/groups/paste_generic.tpl:8 plugins/admin/groups/generic.tpl:9
+msgid "Posix name of the group"
+msgstr "Имя группы, соответствующее стандарту POSIX"
 
-#: plugins/admin/groups/application.tpl:24
-msgid "Available applications"
-msgstr "Доступные приложения"
+#: plugins/admin/groups/paste_generic.tpl:13
+#: plugins/admin/groups/generic.tpl:41
+msgid "Normally IDs are autogenerated, select to specify manually"
+msgstr ""
+"Обычно идентификаторы создаются автоматически, но вы можете выбрать указание "
+"вручную"
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Параметры приложения"
+#: plugins/admin/groups/paste_generic.tpl:15
+#: plugins/admin/groups/generic.tpl:41
+msgid "Force GID"
+msgstr "Указать GID вручную"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Samba"
+#: plugins/admin/groups/paste_generic.tpl:18
+#: plugins/admin/groups/generic.tpl:43
+msgid "Forced ID number"
+msgstr "УказаннÑ\8bй вÑ\80Ñ\83Ñ\87нÑ\83Ñ\8e GID"
 
 #: plugins/admin/groups/class_groupAcl.inc:59
 msgid "This 'dn' is no acl container."
@@ -6929,6 +6909,35 @@ msgstr ""
 msgid "All fields are writeable"
 msgstr "Все поля доступны для записи"
 
+#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
+msgid "Descriptive text for this group"
+msgstr "Описание группы"
+
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
+msgid "Choose subtree to place group in"
+msgstr "Выберите ветку для группы"
+
+#: plugins/admin/groups/generic.tpl:50
+msgid "Select to create a samba conform group"
+msgstr "Создать группу для работы с Samba"
+
+#: plugins/admin/groups/generic.tpl:55
+msgid "in domain"
+msgstr "в домене"
+
+#: plugins/admin/groups/generic.tpl:72
+msgid "Members are in a phone pickup group"
+msgstr "Члены телефонной группы"
+
+#: plugins/admin/groups/generic.tpl:85
+#, fuzzy
+msgid "Members are in a nagios group"
+msgstr "Члены телефонной группы"
+
+#: plugins/admin/groups/generic.tpl:101
+msgid "Group members"
+msgstr "Члены группы"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Администраторы папки"
@@ -6937,6 +6946,10 @@ msgstr "Администраторы папки"
 msgid "Select a specific department"
 msgstr "Выберите подразделение."
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Параметры приложения"
+
 #: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
 msgstr "Показать адреса подразделения"
@@ -6945,15 +6958,15 @@ msgstr "Показать адреса подразделения"
 msgid "Display addresses matching"
 msgstr "Показать подходяшие адреса"
 
-#: plugins/admin/groups/class_groupApplication.inc:394
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Это DN соответствует не группе приложений."
 
-#: plugins/admin/groups/class_groupApplication.inc:402
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Удалить приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:403
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -6961,11 +6974,11 @@ msgstr ""
 "Этой группе доступны приложения. Вы можете запретить доступ к ним, щелкнув "
 "ниже."
 
-#: plugins/admin/groups/class_groupApplication.inc:405
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Создать приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:406
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -6973,109 +6986,94 @@ msgstr ""
 "Этой группе недоступны приложения. Вы можете разрешить доступ к ним, щелкнув "
 "ниже."
 
-#: plugins/admin/groups/class_groupApplication.inc:418
+#: plugins/admin/groups/class_groupApplication.inc:417
 #, fuzzy
 msgid "Invalid character in category name."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/admin/groups/class_groupApplication.inc:426
+#: plugins/admin/groups/class_groupApplication.inc:425
 #, fuzzy
 msgid "The specified category already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/admin/groups/class_groupApplication.inc:515
+#: plugins/admin/groups/class_groupApplication.inc:520
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "Выбранное имя приложения не уникально. Проверьте свою базу данных LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:551
+#: plugins/admin/groups/class_groupApplication.inc:556
 msgid "The selected application has no options."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:633
+#: plugins/admin/groups/class_groupApplication.inc:638
 #: plugins/admin/departments/class_divListDepartment.inc:112
 #, fuzzy
 msgid "department"
 msgstr "подразделения"
 
-#: plugins/admin/groups/class_groupApplication.inc:641
+#: plugins/admin/groups/class_groupApplication.inc:646
 #, fuzzy
 msgid "application"
 msgstr "приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:672
-#: plugins/admin/groups/class_groupApplication.inc:708
+#: plugins/admin/groups/class_groupApplication.inc:677
+#: plugins/admin/groups/class_groupApplication.inc:713
 #, fuzzy
 msgid "Delete entry"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupApplication.inc:676
-#: plugins/admin/groups/class_groupApplication.inc:706
+#: plugins/admin/groups/class_groupApplication.inc:681
+#: plugins/admin/groups/class_groupApplication.inc:711
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:677
-#: plugins/admin/groups/class_groupApplication.inc:707
+#: plugins/admin/groups/class_groupApplication.inc:682
+#: plugins/admin/groups/class_groupApplication.inc:712
 #, fuzzy
 msgid "Move down"
 msgstr "Домен"
 
-#: plugins/admin/groups/class_groupApplication.inc:704
+#: plugins/admin/groups/class_groupApplication.inc:709
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:732
+#: plugins/admin/groups/class_groupApplication.inc:737
 #, fuzzy
 msgid "This application is no longer available."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:735
+#: plugins/admin/groups/class_groupApplication.inc:740
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:739
+#: plugins/admin/groups/class_groupApplication.inc:744
 #, fuzzy
 msgid "Check parameter"
 msgstr "Изменить параметры"
 
-#: plugins/admin/groups/class_groupApplication.inc:741
+#: plugins/admin/groups/class_groupApplication.inc:746
 #, fuzzy
 msgid "This application has changed parameters."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:827
+#: plugins/admin/groups/class_groupApplication.inc:832
 #, fuzzy
 msgid "Removing application information failed"
 msgstr "Информация об организации"
 
-#: plugins/admin/groups/class_groupApplication.inc:871
+#: plugins/admin/groups/class_groupApplication.inc:877
 #, fuzzy
 msgid "Saving application information failed"
 msgstr "Информация об организации"
 
-#: plugins/admin/groups/class_groupApplication.inc:913
+#: plugins/admin/groups/class_groupApplication.inc:919
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:25 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
-msgstr "Группы"
-
-#: plugins/admin/groups/class_groupManagement.inc:244
-#, php-format
-msgid "You're about to delete the group '%s'."
-msgstr "Вы собираетесь удалить группу \"%s\"."
-
-#: plugins/admin/groups/class_groupManagement.inc:250
-#: plugins/admin/groups/class_groupManagement.inc:281
-msgid "You are not allowed to delete this group!"
-msgstr "У вас недостаточно прав для удаления этой группы!"
-
 #: plugins/admin/users/password.tpl:2
 #, fuzzy
 msgid ""
@@ -7087,34 +7085,10 @@ msgstr ""
 "вступят в силу немедленно. Пожалуйста, запомните новый пароль, так как иначе "
 "пользователь не сможет войти в систему."
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Создание пользователя на основе шаблона"
-
-#: plugins/admin/users/template.tpl:6
-#, fuzzy
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-"Можно создавать пользователей на основе шаблонов. При этом многие поля в "
-"базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
-"использовать шаблоны."
-
-#: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
-msgid "Template"
-msgstr "Шаблон"
-
-#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
-msgid "User administration"
-msgstr "Управление пользователями"
-
 #: plugins/admin/users/class_userManagement.inc:28
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/systems/printer.tpl:71 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
+#: html/getxls.php:70 html/getxls.php:243
 msgid "Users"
 msgstr "Пользователи"
 
@@ -7134,8 +7108,8 @@ msgid "You are not allowed to delete this user!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
 #: plugins/admin/users/class_userManagement.inc:451
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "нет"
@@ -7144,17 +7118,41 @@ msgstr "нет"
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Пользователь с таким именем уже есть в этой ветке."
 
-#: plugins/admin/users/remove.tpl:6
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Создание пользователя на основе шаблона"
+
+#: plugins/admin/users/template.tpl:6
+#, fuzzy
 msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+"Можно создавать пользователей на основе шаблонов. При этом многие поля в "
+"базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
+"использовать шаблоны."
+
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:736
+msgid "Template"
+msgstr "Шаблон"
+
+#: plugins/admin/users/remove.tpl:6
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
 "Сюда входит вся информация об учетной записи этого пользователя, его права "
 "доступа в системе, настройки IMAP и т. д. Подумайте еще раз, действительно "
 "ли вам нужно удаление, так как GOsa не сможет отменить результаты этой "
 "операции."
 
+#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+msgid "User administration"
+msgstr "Управление пользователями"
+
 #: plugins/admin/users/class_divListUsers.inc:35
 #: plugins/admin/users/class_divListUsers.inc:36
 #: plugins/admin/systems/glpiSelectUser.tpl:6
@@ -7174,8 +7172,8 @@ msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:50
 #: plugins/gofon/macro/class_divListMacros.inc:46
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
 msgid "Username"
@@ -7316,13 +7314,94 @@ msgstr "в сети"
 msgid "Offline"
 msgstr "не в сети"
 
+#: plugins/admin/applications/class_divListApplication.inc:29
+#, fuzzy
+msgid "List of Applications"
+msgstr "Список приложений"
+
+#: plugins/admin/applications/class_divListApplication.inc:30
+#, fuzzy
+msgid "This table displays all applications in the selected tree."
+msgstr "Приложение с таким именем уже существует."
+
+#: plugins/admin/applications/class_divListApplication.inc:34
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"приложения. Если у вас достаточно большое количество приложений, вы можете "
+"использовать групповое выделение."
+
+#: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:446
-#: plugins/admin/applications/class_divListApplication.inc:44
 msgid "Application name"
 msgstr "Приложение"
 
+#: plugins/admin/applications/class_divListApplication.inc:100
+#: plugins/admin/ogroups/class_divListOGroup.inc:108
+#, fuzzy
+msgid "new"
+msgstr "Создать"
+
+#: plugins/admin/applications/class_divListApplication.inc:101
+#, fuzzy
+msgid "Create new application"
+msgstr "Создать приложения"
+
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr "Удалить параметры"
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Для этого приложения указаны параметры. Вы можете отключить их "
+"использование, щелкнув ниже."
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr "Создать параметры"
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Для этого приложения отключено использование параметров. Вы можете включить "
+"его, щелкнув ниже."
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr "Переменная"
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "По умолчанию"
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr "Добавить параметр"
+
+#: plugins/admin/applications/class_applicationParameters.inc:128
+#, fuzzy
+msgid "Removing application parameters failed"
+msgstr "Изменить дополнительные параметры приложения"
+
+#: plugins/admin/applications/class_applicationParameters.inc:159
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "Значение \"%s\", указанное как имя параметра, некорректно."
+
+#: plugins/admin/applications/class_applicationParameters.inc:190
+#, fuzzy
+msgid "Saving applications parameters failed"
+msgstr "Изменить дополнительные параметры приложения"
+
 #: plugins/admin/applications/generic.tpl:11
 #: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
 msgid "Display name"
@@ -7376,55 +7455,6 @@ msgstr "Помещать членам группы соответствующи
 msgid "Place entry in members launch bar"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Удалить параметры"
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Для этого приложения указаны параметры. Вы можете отключить их "
-"использование, щелкнув ниже."
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Создать параметры"
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Для этого приложения отключено использование параметров. Вы можете включить "
-"его, щелкнув ниже."
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr "Переменная"
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "По умолчанию"
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr "Добавить параметр"
-
-#: plugins/admin/applications/class_applicationParameters.inc:128
-#, fuzzy
-msgid "Removing application parameters failed"
-msgstr "Изменить дополнительные параметры приложения"
-
-#: plugins/admin/applications/class_applicationParameters.inc:159
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "Значение \"%s\", указанное как имя параметра, некорректно."
-
-#: plugins/admin/applications/class_applicationParameters.inc:190
-#, fuzzy
-msgid "Saving applications parameters failed"
-msgstr "Изменить дополнительные параметры приложения"
-
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -7439,16 +7469,6 @@ msgstr ""
 msgid "Application management"
 msgstr "Управление приложениями"
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Вы собираетесь удалить приложение \"%s\"."
-
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
-msgid "You are not allowed to delete this application!"
-msgstr "У вас недостаточно прав для удаления этого приложения!"
-
 #: plugins/admin/applications/class_applicationGeneric.inc:96
 #, fuzzy
 msgid "no example"
@@ -7512,37 +7532,49 @@ msgstr "Приложение"
 msgid "Application settings"
 msgstr "Параметры приложения"
 
-#: plugins/admin/applications/class_divListApplication.inc:29
-#, fuzzy
-msgid "List of Applications"
-msgstr "СпиÑ\81ок пÑ\80иложений"
+#: plugins/admin/applications/class_applicationManagement.inc:287
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Ð\92Ñ\8b Ñ\81обиÑ\80аеÑ\82еÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c пÑ\80иложение \"%s\"."
 
-#: plugins/admin/applications/class_divListApplication.inc:30
-#, fuzzy
-msgid "This table displays all applications in the selected tree."
-msgstr "Ð\9fÑ\80иложение Ñ\81 Ñ\82аким именем Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
+#: plugins/admin/applications/class_applicationManagement.inc:293
+#: plugins/admin/applications/class_applicationManagement.inc:322
+msgid "You are not allowed to delete this application!"
+msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\83далениÑ\8f Ñ\8dÑ\82ого пÑ\80иложениÑ\8f!"
 
-#: plugins/admin/applications/class_divListApplication.inc:34
+#: plugins/admin/departments/class_divListDepartment.inc:27
+#: plugins/admin/departments/class_divListDepartment.inc:28
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
+msgstr "Список подразделений"
+
+#: plugins/admin/departments/class_divListDepartment.inc:33
 #, fuzzy
 msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on   top "
+"of the department list."
 msgstr ""
 "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"приложения. Если у вас достаточно большое количество приложений, вы можете "
-"использовать групповое выделение."
+"подразделения. Если у вас достаточно большое количество подразделений, вы "
+"можеÑ\82е иÑ\81полÑ\8cзоваÑ\82Ñ\8c гÑ\80Ñ\83пповое вÑ\8bделение."
 
-#: plugins/admin/applications/class_divListApplication.inc:100
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
+#: plugins/admin/departments/class_divListDepartment.inc:41
 #, fuzzy
-msgid "new"
-msgstr "СоздаÑ\82Ñ\8c"
+msgid "Department name"
+msgstr "УпÑ\80авление подÑ\80азделениÑ\8fми"
 
-#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:74
 #, fuzzy
-msgid "Create new application"
-msgstr "Создать приложения"
+msgid "Create new department"
+msgstr "Подразделение"
+
+#: plugins/admin/departments/dep_iframe.tpl:3
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
 
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
@@ -7611,12 +7643,6 @@ msgstr ""
 "подразделения. Подумайте еще раз, действительно ли вы хотите его удалить, "
 "так как GOsa не сможет отменить результаты этой операции."
 
-#: plugins/admin/departments/headpage.tpl:6
-#: plugins/admin/departments/class_divListDepartment.inc:27
-#: plugins/admin/departments/class_divListDepartment.inc:28
-msgid "List of departments"
-msgstr "Список подразделений"
-
 #: plugins/admin/departments/headpage.tpl:24
 #, fuzzy
 msgid ""
@@ -7640,27 +7666,6 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Department management"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_divListOGroup.inc:52
-msgid "Departments"
-msgstr "Подразделения"
-
-#: plugins/admin/departments/class_departmentManagement.inc:158
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
-#, php-format
-msgid "You're about to delete the whole LDAP subtree placed under '%s'."
-msgstr "Вы собираетесь удалить целую ветку LDAP с корнем в \"%s\"."
-
-#: plugins/admin/departments/class_departmentManagement.inc:179
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
-msgid "You have no permission to remove this department."
-msgstr "У вас недостаточно прав для удаления этого подразделения."
-
-#: plugins/admin/departments/class_departmentManagement.inc:334
-msgid ".."
-msgstr ""
-
 #: plugins/admin/departments/class_departmentGeneric.inc:170
 #, fuzzy
 msgid "Removing department failed"
@@ -7709,77 +7714,263 @@ msgstr ""
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-
-#: plugins/admin/departments/class_divListDepartment.inc:33
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/ogroups/class_divListOGroup.inc:52
+msgid "Departments"
+msgstr "Подразделения"
+
+#: plugins/admin/departments/class_departmentManagement.inc:158
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
+#, php-format
+msgid "You're about to delete the whole LDAP subtree placed under '%s'."
+msgstr "Вы собираетесь удалить целую ветку LDAP с корнем в \"%s\"."
+
+#: plugins/admin/departments/class_departmentManagement.inc:179
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
+msgid "You have no permission to remove this department."
+msgstr "У вас недостаточно прав для удаления этого подразделения."
+
+#: plugins/admin/departments/class_departmentManagement.inc:334
+msgid ".."
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+#, fuzzy
+msgid "Reference"
+msgstr "Ссылки"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#, fuzzy
+msgid "Comments"
+msgstr "Контакт"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#, fuzzy
+msgid "Comment"
+msgstr "Контакт"
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+msgid "Manufacturer"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+msgid "Technical responsible"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "Удалить сервис DHCP"
+
+#: plugins/admin/systems/class_servDHCP.inc:37
 #, fuzzy
 msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on   top "
-"of the department list."
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"подразделения. Если у вас достаточно большое количество подразделений, вы "
-"можете использовать групповое выделение."
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/departments/class_divListDepartment.inc:41
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr "Добавить сервис DHCP"
+
+#: plugins/admin/systems/class_servDHCP.inc:40
 #, fuzzy
-msgid "Department name"
-msgstr "Управление подразделениями"
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/departments/class_divListDepartment.inc:74
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Системы"
+
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
+msgstr "Вы не можете редактировать сейчас этот тип объекта!"
+
+#: plugins/admin/systems/class_systemManagement.inc:236
+msgid "Passwords entered as new and repeated do not match!"
+msgstr "Введенные пароли не совпадают!"
+
+#: plugins/admin/systems/class_systemManagement.inc:253
+msgid "You are not allowed to set this systems password!"
+msgstr "У вас недостаточно прав для смены пароля этой системы!"
+
+#: plugins/admin/systems/class_systemManagement.inc:307
+#, fuzzy, php-format
+msgid "You're about to delete all information about the component at '%s'."
+msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
+
+#: plugins/admin/systems/class_systemManagement.inc:616
+msgid "New terminal"
+msgstr "Создать терминал"
+
+#: plugins/admin/systems/class_systemManagement.inc:618
+msgid "New workstation"
+msgstr "Новая рабочая станция"
+
+#: plugins/admin/systems/class_systemManagement.inc:620
 #, fuzzy
-msgid "Create new department"
-msgstr "Подразделение"
+msgid "New Device"
+msgstr "Сетевые устройства"
+
+#: plugins/admin/systems/class_systemManagement.inc:635
+#, fuzzy
+msgid "Terminal template for"
+msgstr "Шаблон терминала"
+
+#: plugins/admin/systems/class_systemManagement.inc:647
+msgid "Workstation template for"
+msgstr "Шаблон рабочей станции для"
+
+#: plugins/admin/systems/class_systemManagement.inc:735
+#, fuzzy
+msgid "New System from incoming"
+msgstr "Системная информация"
+
+#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:370
+#, fuzzy
+msgid "Terminal"
+msgstr "Терминалы"
+
+#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Рабочая станция"
+
+#: plugins/admin/systems/class_systemManagement.inc:739
+#, fuzzy
+msgid "Workstation is installing"
+msgstr "Имя рабочий станции"
+
+#: plugins/admin/systems/class_systemManagement.inc:740
+#, fuzzy
+msgid "Workstation is waiting for action"
+msgstr "Шаблон рабочей станции для"
+
+#: plugins/admin/systems/class_systemManagement.inc:741
+#, fuzzy
+msgid "Workstation installation failed"
+msgstr "Шаблон рабочей станции"
+
+#: plugins/admin/systems/class_systemManagement.inc:744
+msgid "Server is installing"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:745
+#, fuzzy
+msgid "Server is waiting for action"
+msgstr "Общая информация о пользователе"
+
+#: plugins/admin/systems/class_systemManagement.inc:746
+#, fuzzy
+msgid "Server installation failed"
+msgstr "Номер дома"
+
+#: plugins/admin/systems/class_systemManagement.inc:747
+#, fuzzy
+msgid "Winstation"
+msgstr "Рабочая станция"
+
+#: plugins/admin/systems/class_systemManagement.inc:748
+#, fuzzy
+msgid "Network Device"
+msgstr "Сетевые устройства"
+
+#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_divListSystem.inc:96
+#, fuzzy
+msgid "New Terminal"
+msgstr "Создать терминал"
+
+#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_divListSystem.inc:98
+#, fuzzy
+msgid "New Workstation"
+msgstr "Новая рабочая станция"
 
 #: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:200
+#: plugins/admin/systems/class_terminalInfo.inc:199
 msgid "present"
 msgstr "присутствует"
 
-#: plugins/admin/systems/class_terminalInfo.inc:68
-#: plugins/admin/systems/class_workstationService.inc:205
-#: plugins/admin/systems/class_workstationStartup.inc:431
-#: plugins/admin/systems/class_terminalService.inc:211
-#: plugins/admin/systems/class_terminalStartup.inc:129
+#: plugins/admin/systems/class_terminalInfo.inc:67
+#: plugins/admin/systems/class_terminalService.inc:252
+#: plugins/admin/systems/class_workstationService.inc:241
+#: plugins/admin/systems/class_workstationStartup.inc:478
+#: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:191
 msgid "This 'dn' has no terminal features."
 msgstr "Это DN не соответствует терминалу."
 
-#: plugins/admin/systems/class_terminalInfo.inc:75
+#: plugins/admin/systems/class_terminalInfo.inc:74
 #, fuzzy
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 "Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
 "права доступа к общим папкам."
 
-#: plugins/admin/systems/class_terminalInfo.inc:81
-#: plugins/admin/systems/class_terminalInfo.inc:175
+#: plugins/admin/systems/class_terminalInfo.inc:80
+#: plugins/admin/systems/class_terminalInfo.inc:174
 msgid "unknown status"
 msgstr "состояние неизвестно"
 
-#: plugins/admin/systems/class_terminalInfo.inc:90
+#: plugins/admin/systems/class_terminalInfo.inc:89
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr "Это виртуальный терминал без особых свойств."
 
-#: plugins/admin/systems/class_terminalInfo.inc:108
+#: plugins/admin/systems/class_terminalInfo.inc:107
 msgid "online"
 msgstr "в сети"
 
-#: plugins/admin/systems/class_terminalInfo.inc:164
+#: plugins/admin/systems/class_terminalInfo.inc:163
 msgid "running"
 msgstr "запущен"
 
-#: plugins/admin/systems/class_terminalInfo.inc:167
+#: plugins/admin/systems/class_terminalInfo.inc:166
 msgid "not running"
 msgstr "не запущен"
 
-#: plugins/admin/systems/class_terminalInfo.inc:192
+#: plugins/admin/systems/class_terminalInfo.inc:191
 msgid "offline"
 msgstr "не в сети"
 
@@ -7796,196 +7987,45 @@ msgstr "IP-адрес"
 msgid "MAC-address"
 msgstr "MAC-адрес"
 
-#: plugins/admin/systems/network.tpl:35
+#: plugins/admin/systems/network.tpl:19
+msgid "Autodetect"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:41
 msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:44
+#: plugins/admin/systems/network.tpl:50
 #, fuzzy
 msgid "Zone"
 msgstr "телефоны"
 
-#: plugins/admin/systems/network.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:85
+#: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:160
+#: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:57
+#: plugins/admin/systems/network.tpl:63
 #, fuzzy
 msgid "Dns records"
 msgstr "Каталог"
 
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr "Клавиатура"
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "Системная информация"
 
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-msgid "Model"
-msgstr "Модель"
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr "Процессор"
 
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr "Выберите модель клавиатуры"
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr "Память"
 
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr "Раскладка"
-
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Выберите раскладку"
-
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr "Вариант"
-
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Выберите вариант раскладки"
-
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
-msgstr "Мышь"
-
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr "Выберите тип мыши"
-
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr "Порт"
-
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-msgid "Choose mouse port"
-msgstr "Выберите порт мыши"
-
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-#: plugins/gofon/phoneaccount/generic.tpl:24
-msgid "Telephone hardware"
-msgstr "Телефонное оборудование"
-
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-msgid "Telephone"
-msgstr "Телефон"
-
-#: plugins/admin/systems/workstationService.tpl:83
-#: plugins/admin/systems/info.tpl:73
-#: plugins/admin/systems/terminalService.tpl:83
-msgid "Graphic device"
-msgstr "Видеокарта"
-
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:86
-#: plugins/admin/systems/printer.tpl:51
-msgid "Driver"
-msgstr "Драйвер"
-
-#: plugins/admin/systems/workstationService.tpl:88
-#: plugins/admin/systems/terminalService.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
-msgstr "Выберите подходящий драйвер для установленной видеокарты"
-
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Выберите подходящее разрешение экрана"
-
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr "Глубина цвета"
-
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr "Выберите подходящую глубину цвета"
-
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
-msgstr "Устройство отображения"
-
-#: plugins/admin/systems/workstationService.tpl:121
-#: plugins/admin/systems/class_workstationService.inc:94
-#: plugins/admin/systems/class_terminalService.inc:69
-#, fuzzy
-msgid "unknown"
-msgstr "состояние неизвестно"
-
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
-msgstr ""
-
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
-msgstr "Строчная синхронизация"
-
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr "Частота обновления строк для данного монитора"
-
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
-msgstr "Кадровая синхронизация"
-
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr "Частота обновления кадров для данного монитора"
-
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
-msgstr "Устройство сканирования"
-
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
-msgstr "Выберите, чтобы запустить на терминале службу сканирования"
-
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
-msgstr "Предоставлять службу сканирования"
-
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "Системная информация"
-
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
-msgstr "Процессор"
-
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
-msgstr "Память"
-
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
-msgstr "MAC-адрес"
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr "MAC-адрес"
 
 #: plugins/admin/systems/info.tpl:16
 msgid "USB support"
@@ -8024,6 +8064,12 @@ msgstr "Дисковод"
 msgid "CDROM device"
 msgstr "Привод CDROM"
 
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/terminalService.tpl:83
+msgid "Graphic device"
+msgstr "Видеокарта"
+
 #: plugins/admin/systems/info.tpl:77
 msgid "Audio device"
 msgstr "Звуковая карта"
@@ -8075,24 +8121,6 @@ msgstr "Системы"
 msgid "Operating system"
 msgstr "Удалить"
 
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-msgid "Manufacturer"
-msgstr ""
-
 #: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 #, fuzzy
 msgid "Contacts"
@@ -8103,30 +8131,6 @@ msgstr "Контакт"
 msgid "Contact person"
 msgstr "Контакт"
 
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-msgid "Technical responsible"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#, fuzzy
-msgid "Comment"
-msgstr "Контакт"
-
 #: plugins/admin/systems/glpi.tpl:78
 #, fuzzy
 msgid "Installed devices"
@@ -8185,6 +8189,35 @@ msgstr ""
 msgid "Installed cartridges"
 msgstr "Клиентские устройства"
 
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
+msgid ""
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
+msgstr ""
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
+msgid ""
+"Be careful editing record types with this dialog. All changes will be saved "
+"immediately when using the save button."
+msgstr ""
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+msgid ""
+"This dialog can't be used until the currently edited zone was saved or the "
+"zone entry exists in the ldap database."
+msgstr ""
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#, fuzzy
+msgid "New entry"
+msgstr "пользователи"
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#, fuzzy
+msgid "Create a new DNS zone entry"
+msgstr "Создание нового объекта в"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 #, fuzzy
 msgid "Manage System-types"
@@ -8194,9 +8227,9 @@ msgstr "Системы"
 #: plugins/admin/systems/glpi_edit_type.tpl:28
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
 #: plugins/admin/systems/glpi_edit_os.tpl:9
 #: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
 #, fuzzy
 msgid "Rename"
 msgstr "Имя сервера"
@@ -8208,22 +8241,13 @@ msgstr "Имя сервера"
 msgid "Please enter a new name"
 msgstr "Введите адрес сервера"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Выбрать объекты для добавления"
+#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+#, fuzzy
+msgid "unknown"
+msgstr "состояние неизвестно"
 
-#: plugins/admin/systems/class_workstationService.inc:66
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:112
-#: plugins/admin/systems/class_workstationService.inc:116
-#: plugins/admin/systems/class_workstationService.inc:121
-#: plugins/admin/systems/class_workstationService.inc:122
-#: plugins/admin/systems/class_workstationStartup.inc:57
-#: plugins/admin/systems/class_workstationStartup.inc:255
-#: plugins/admin/systems/class_workstationStartup.inc:612
-#: plugins/admin/systems/class_workstationGeneric.inc:110
 #: plugins/admin/systems/class_terminalService.inc:72
 #: plugins/admin/systems/class_terminalService.inc:100
 #: plugins/admin/systems/class_terminalService.inc:106
@@ -8231,1831 +8255,1737 @@ msgstr "Выбрать объекты для добавления"
 #: plugins/admin/systems/class_terminalService.inc:117
 #: plugins/admin/systems/class_terminalService.inc:119
 #: plugins/admin/systems/class_terminalService.inc:123
+#: plugins/admin/systems/class_terminalService.inc:214
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_terminalService.inc:220
+#: plugins/admin/systems/class_terminalService.inc:223
+#: plugins/admin/systems/class_terminalService.inc:226
+#: plugins/admin/systems/class_terminalService.inc:229
+#: plugins/admin/systems/class_terminalService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_workstationService.inc:207
+#: plugins/admin/systems/class_workstationService.inc:210
+#: plugins/admin/systems/class_workstationService.inc:213
+#: plugins/admin/systems/class_workstationService.inc:216
+#: plugins/admin/systems/class_workstationService.inc:219
+#: plugins/admin/systems/class_workstationStartup.inc:263
+#: plugins/admin/systems/class_workstationStartup.inc:281
+#: plugins/admin/systems/class_workstationStartup.inc:285
+#: plugins/admin/systems/class_workstationStartup.inc:785
 #: plugins/admin/systems/class_terminalStartup.inc:39
-#: plugins/admin/systems/class_terminalStartup.inc:110
+#: plugins/admin/systems/class_terminalStartup.inc:111
+#: plugins/admin/systems/class_terminalStartup.inc:131
+#: plugins/admin/systems/class_workstationGeneric.inc:110
 #: plugins/admin/systems/class_terminalGeneric.inc:105
 #: plugins/admin/systems/class_terminalGeneric.inc:246
 msgid "inherited"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:98
-#: plugins/admin/systems/class_workstationService.inc:99
-#: plugins/admin/systems/class_workstationService.inc:100
-#: plugins/admin/systems/class_workstationService.inc:101
 #: plugins/admin/systems/class_terminalService.inc:101
 #: plugins/admin/systems/class_terminalService.inc:102
 #: plugins/admin/systems/class_terminalService.inc:103
 #: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
 #, fuzzy
 msgid "bit"
 msgstr "запись"
 
-#: plugins/admin/systems/class_workstationService.inc:143
 #: plugins/admin/systems/class_terminalService.inc:155
 msgid "default"
 msgstr "по умолчанию"
 
-#: plugins/admin/systems/class_workstationService.inc:144
 #: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:138
 msgid "show chooser"
 msgstr "показать окно входа в систему"
 
-#: plugins/admin/systems/class_workstationService.inc:145
 #: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:139
 msgid "direct"
 msgstr "напрямую"
 
-#: plugins/admin/systems/class_workstationService.inc:148
 #: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:142
 msgid "load balanced"
 msgstr "с выравниваем нагрузки"
 
-#: plugins/admin/systems/class_workstationService.inc:151
 #: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_workstationService.inc:145
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
-#: plugins/admin/systems/class_workstationService.inc:152
 #: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:146
 msgid "ICA client"
 msgstr "Клиент ICA"
 
-#: plugins/admin/systems/class_workstationService.inc:255
-#: plugins/admin/systems/class_terminalService.inc:262
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_workstationService.inc:204
+#, fuzzy
+msgid "Bit"
+msgstr "запись"
+
+#: plugins/admin/systems/class_terminalService.inc:303
+#: plugins/admin/systems/class_workstationService.inc:291
 #, fuzzy
 msgid "Choose the phone located at the current terminal"
 msgstr "Выбрать раздел, для хранения объекта"
 
-#: plugins/admin/systems/class_workstationService.inc:318
-#: plugins/admin/systems/class_workstationService.inc:323
-#: plugins/admin/systems/class_terminalService.inc:324
-#: plugins/admin/systems/class_terminalService.inc:329
+#: plugins/admin/systems/class_terminalService.inc:365
+#: plugins/admin/systems/class_terminalService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:354
+#: plugins/admin/systems/class_workstationService.inc:359
 msgid "Please specify a valid VSync range."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/admin/systems/class_workstationService.inc:333
-#: plugins/admin/systems/class_workstationService.inc:338
-#: plugins/admin/systems/class_terminalService.inc:339
-#: plugins/admin/systems/class_terminalService.inc:344
+#: plugins/admin/systems/class_terminalService.inc:380
+#: plugins/admin/systems/class_terminalService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:369
+#: plugins/admin/systems/class_workstationService.inc:374
 msgid "Please specify a valid HSync range."
 msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
 
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_terminalService.inc:416
 #, fuzzy
-msgid "Saving workstation services failed"
-msgstr "Дополнительные записи в fstab"
-
-#: plugins/admin/systems/class_workstationStartup.inc:262
-#: plugins/admin/systems/class_terminalStartup.inc:93
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
-"exist."
-msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
+msgid "Saving terminal service information failed"
+msgstr "Информация об организации"
 
-#: plugins/admin/systems/class_workstationStartup.inc:366
-msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:2
+#, fuzzy
+msgid "Add/Edit monitor"
+msgstr "Редактиовать объект"
 
-#: plugins/admin/systems/class_workstationStartup.inc:411
+#: plugins/admin/systems/glpi_devices.tpl:33
 #, fuzzy
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она!"
+msgid "Monitor size"
+msgstr "Ð\9cониÑ\82оÑ\80инг"
 
-#: plugins/admin/systems/class_workstationStartup.inc:469
+#: plugins/admin/systems/glpi_devices.tpl:36
 #, fuzzy
-msgid ""
-"There is already a profile in your selection that contain partition table "
-"configurations."
-msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
+msgid "Inch"
+msgstr "Французский"
 
-#: plugins/admin/systems/class_workstationStartup.inc:794
-#, php-format
-msgid ""
-"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
-"Server was reset to 'auto'."
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:805
-#, php-format
-msgid ""
-"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+#, fuzzy
+msgid "Yes"
+msgstr "Системы"
 
-#: plugins/admin/systems/class_workstationStartup.inc:958
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
 #, fuzzy
-msgid "Saving workstation startup settings failed"
-msgstr "Шаблон Ñ\80абоÑ\87ей Ñ\81Ñ\82анÑ\86ии"
+msgid "No"
+msgstr "неÑ\82"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1008
-#: plugins/admin/systems/class_servRepositorySetup.inc:170
-#, fuzzy, php-format
-msgid ""
-"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
-msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
+msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1010
-#: plugins/admin/systems/class_servRepositorySetup.inc:172
-#, php-format
-msgid ""
-"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
-"empty string."
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:62
-#, php-format
-msgid "Can't open '%s', ppd settings resetted."
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:87
+#: plugins/admin/systems/glpi_devices.tpl:76
 #, fuzzy
-msgid "Can't get ppd informations."
-msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
+msgid "Serial number"
+msgstr "ТеÑ\80минал"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:99
-#, php-format
-msgid ""
-"The specified path '%s' which results from PPD_PATH in your gosa.conf is "
-"invalid, can't read/write any ppd informations."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:83
+#, fuzzy
+msgid "Additional serial number"
+msgstr "Серийный номер сертификата"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:116
+#: plugins/admin/systems/glpi_devices.tpl:97
 #, fuzzy
-msgid "Please specify a valid ppd file."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f!"
+msgid "Add/Edit other device"
+msgstr "Ð\97вÑ\83коваÑ\8f каÑ\80Ñ\82а"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:186
-#, php-format
-msgid "Can't select PPD file '%s', the file is not readable"
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:203
-#: plugins/admin/systems/class_printerPPDDialog.inc:275
-#, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:211
-#, fuzzy, php-format
-msgid "Can't create file '%s' to store modifed ppd informations."
-msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
+#: plugins/admin/systems/glpi_devices.tpl:181
+#, fuzzy
+msgid "Power"
+msgstr "Ð\9fоÑ\80Ñ\82"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:235
-#, php-format
-msgid "Can't add new ppd file, the source file '%s' is not accessible."
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:253
-#, fuzzy, php-format
-msgid ""
-"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
-"informations."
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
 msgstr ""
-"Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
-"права доступа к общим папкам."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:267
-#, fuzzy, php-format
-msgid "There is already a ppd file for this kind of printer."
-msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
+#: plugins/admin/systems/glpi_devices.tpl:237
+#, fuzzy
+msgid "Ram"
+msgstr "Имя сервера"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:288
-#, fuzzy, php-format
-msgid "Can't save file '%s'."
-msgstr "УдалиÑ\82Ñ\8c"
+#: plugins/admin/systems/glpi_devices.tpl:249
+#, fuzzy
+msgid "Add/Edit controller"
+msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:292
-msgid "Uploaded ppd file is empty, can't create new ppd file."
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:462
-#: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: plugins/admin/systems/glpi_devices.tpl:342
 #, fuzzy
-msgid "True"
-msgstr "УлиÑ\86а"
+msgid "Speed"
+msgstr "Ð\9fол"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:463
-#: plugins/admin/systems/class_printerPPDDialog.inc:466
+#: plugins/admin/systems/glpi_devices.tpl:358
 #, fuzzy
-msgid "False"
-msgstr "женÑ\81кий"
+msgid "Writeable"
+msgstr "запиÑ\81Ñ\8c"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:471
-#, php-format
-msgid "Unsupported ppd type '%s' used for '%s' "
+#: plugins/admin/systems/glpi_devices.tpl:371
+#, fuzzy
+msgid "Add/Edit harddisk"
+msgstr "Сервер"
+
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Имя сервера"
+#: plugins/admin/systems/glpi_devices.tpl:413
+#, fuzzy
+msgid "Cache"
+msgstr "Отмена"
 
-#: plugins/admin/systems/server.tpl:17 plugins/admin/systems/terminal.tpl:19
-#: plugins/admin/systems/workstation.tpl:25
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Выберите ветку терминала"
+#: plugins/admin/systems/glpi_devices.tpl:443
+#, fuzzy
+msgid "Add/Edit memory"
+msgstr "Редактиовать объект"
 
-#: plugins/admin/systems/server.tpl:32 plugins/admin/systems/terminal.tpl:34
-#: plugins/admin/systems/workstation.tpl:39
-#: plugins/admin/systems/phonesettings.tpl:21
-#: plugins/admin/ogroups/termgroup.tpl:38
-msgid "Mode"
-msgstr "Режим"
+#: plugins/admin/systems/glpi_devices.tpl:478
+#, fuzzy
+msgid "Frequenz"
+msgstr "Номер телефона"
 
-#: plugins/admin/systems/server.tpl:34 plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:41
-#: plugins/admin/ogroups/termgroup.tpl:40
-msgid "Select terminal mode"
-msgstr "Выберите режим терминала"
+#: plugins/admin/systems/glpi_devices.tpl:507
+#, fuzzy
+msgid "Add/Edit sound card"
+msgstr "Новый пароль"
 
-#: plugins/admin/systems/server.tpl:50 plugins/admin/systems/terminal.tpl:115
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/workstation.tpl:93
-#: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/ogroups/termgroup.tpl:75
-msgid "Action"
-msgstr "Действие"
+#: plugins/admin/systems/glpi_devices.tpl:553
+#, fuzzy
+msgid "Add/Edit network interface"
+msgstr "Сетевой принтер"
 
-#: plugins/admin/systems/server.tpl:54
+#: plugins/admin/systems/glpi_devices.tpl:589
 #, fuzzy
-msgid "Select action to execute for this server"
-msgstr "Выберите действие, которое нужно выполнить на этом терминале"
+msgid "MAC address"
+msgstr "MAC-адрес"
 
-#: plugins/admin/systems/workstationStartup.tpl:4
-#: plugins/admin/systems/terminalStartup.tpl:1
-msgid "Boot parameters"
-msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b загÑ\80Ñ\83зки"
+#: plugins/admin/systems/glpi_devices.tpl:607
+#, fuzzy
+msgid "Add/Edit processor"
+msgstr "Ð\9dовÑ\8bй паÑ\80олÑ\8c"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:13
-msgid "Boot kernel"
-msgstr "ЯдÑ\80о длÑ\8f загÑ\80Ñ\83зки"
+#: plugins/admin/systems/glpi_devices.tpl:642
+#, fuzzy
+msgid "Frequence"
+msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
 
-#: plugins/admin/systems/workstationStartup.tpl:17
-#: plugins/admin/systems/terminalStartup.tpl:22
-msgid "Custom options"
-msgstr "Ð\94ополниÑ\82елÑ\8cнÑ\8bе паÑ\80амеÑ\82Ñ\80Ñ\8b"
+#: plugins/admin/systems/glpi_devices.tpl:649
+#, fuzzy
+msgid "Default frequence"
+msgstr "Ð\9fо Ñ\83молÑ\87аниÑ\8e"
 
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:24
-msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
-msgstr ""
-"Введите любые дополнительные параметры, которые должны передаваться ядру во "
-"время загрузки"
-
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP-сервер"
-
-#: plugins/admin/systems/workstationStartup.tpl:37
+#: plugins/admin/systems/glpi_devices.tpl:661
 #, fuzzy
-msgid "FAI server"
-msgstr "LDAP-сервер"
+msgid "Add/Edit motherboard"
+msgstr "Клавиатура"
 
-#: plugins/admin/systems/workstationStartup.tpl:46
+#: plugins/admin/systems/glpi_devices.tpl:696
 #, fuzzy
-msgid "set"
+msgid "Chipset"
 msgstr "сброс"
 
-#: plugins/admin/systems/workstationStartup.tpl:53
+#: plugins/admin/systems/glpi_devices.tpl:707
 #, fuzzy
-msgid "Assigned FAI classes"
-msgstr "Выберите тип мыши"
-
-#: plugins/admin/systems/workstationStartup.tpl:72
-#: plugins/admin/systems/terminalStartup.tpl:53
-msgid "Kernel modules (format: name parameters)"
-msgstr "Модули ядра (формат: имя параметры)"
-
-#: plugins/admin/systems/workstationStartup.tpl:74
-#: plugins/admin/systems/terminalStartup.tpl:55
-msgid "Add additional modules to load on startup"
-msgstr ""
-"Укажите дополнительные модули, которые должны загружаться при запуске системы"
+msgid "Add/Edit computer case"
+msgstr "не полный"
 
-#: plugins/admin/systems/workstationStartup.tpl:98
-#: plugins/admin/systems/terminalStartup.tpl:79
+#: plugins/admin/systems/glpi_devices.tpl:742
 #, fuzzy
-msgid "Mountpoint"
-msgstr "Ð\9cониÑ\82оÑ\80инг"
+msgid "format"
+msgstr "Ð\9fоÑ\80Ñ\82"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#: plugins/admin/systems/class_workstationService.inc:415
 #, fuzzy
-msgid "List of devices"
-msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
+msgid "Saving workstation services failed"
+msgstr "Ð\94ополниÑ\82елÑ\8cнÑ\8bе запиÑ\81и в fstab"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#, fuzzy
+msgid "Add/Edit manufacturer"
+msgstr "Редактиовать объект"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
 #, fuzzy
-msgid "Display devices matching"
-msgstr "Ð\9fоказаÑ\82Ñ\8c подÑ\85одÑ\8fÑ\88ие адÑ\80еÑ\81а"
+msgid "Website"
+msgstr "запиÑ\81Ñ\8c"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:691
+#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
+#: html/getxls.php:236
 #, fuzzy
-msgid "Regular expression for matching device names"
-msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам полÑ\8cзоваÑ\82елей"
+msgid "Phone number"
+msgstr "ТелеÑ\84оннÑ\8bе номеÑ\80а"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-#: plugins/admin/systems/class_glpiAccount.inc:144
-msgid "There is no server with valid glpi database service."
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Клавиатура"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#, fuzzy
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
+msgstr "Модель"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#, fuzzy
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Выберите модель клавиатуры"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#: plugins/admin/systems/class_glpiAccount.inc:565
-#, fuzzy
-msgid "Remove inventory"
-msgstr "Удалить объект"
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Раскладка"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-#, fuzzy
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Выберите раскладку"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-#: plugins/admin/systems/class_glpiAccount.inc:568
-#, fuzzy
-msgid "Add inventory"
-msgstr "Добавить объект"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Вариант"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
-#, fuzzy
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Выберите вариант раскладки"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Мышь"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
-#: plugins/admin/systems/class_glpiAccount.inc:633
-#: plugins/admin/systems/class_glpiAccount.inc:648
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
-msgid "N/A"
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Порт"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
-#, fuzzy
-msgid "since"
-msgstr "РабоÑ\82аеÑ\82 Ñ\81"
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е поÑ\80Ñ\82 мÑ\8bÑ\88и"
 
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr "Шаблон терминала"
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+#: plugins/gofon/phoneaccount/generic.tpl:24
+msgid "Telephone hardware"
+msgstr "Телефонное оборудование"
 
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr "Терминал"
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+msgid "Telephone"
+msgstr "Телефон"
 
-#: plugins/admin/systems/terminal.tpl:42
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:47
-msgid "Syslog server"
-msgstr "СеÑ\80веÑ\80 Ñ\81иÑ\81Ñ\82емнÑ\8bÑ\85 жÑ\83Ñ\80налов"
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/printer.tpl:51
+#: plugins/admin/systems/terminalService.tpl:86
+msgid "Driver"
+msgstr "Ð\94Ñ\80айвеÑ\80"
 
-#: plugins/admin/systems/terminal.tpl:44
-#: plugins/admin/systems/workstation.tpl:49
-#: plugins/admin/ogroups/termgroup.tpl:49
-msgid "Choose server to use for logging"
-msgstr "Выберите сервер для ведения системных журналов"
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
+msgstr "Выберите подходящий драйвер для установленной видеокарты"
 
-#: plugins/admin/systems/terminal.tpl:59
-msgid "Root server"
-msgstr "Основной сервер"
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Выберите подходящее разрешение экрана"
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Select NFS root filesystem to use"
-msgstr "Выберите корневую файловую систему NFS"
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Глубина цвета"
 
-#: plugins/admin/systems/terminal.tpl:67
-msgid "Swap server"
-msgstr "Сервер подкачки"
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
+msgstr "Выберите подходящую глубину цвета"
 
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Выберите файловую систему NFS для файлов подкачки"
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr "Устройство отображения"
 
-#: plugins/admin/systems/terminal.tpl:86
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Inherit time server attributes"
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:90
-#: plugins/admin/systems/workstation.tpl:69
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr "Сервер NTP"
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr "Строчная синхронизация"
 
-#: plugins/admin/systems/terminal.tpl:92
-#: plugins/admin/systems/workstation.tpl:71
-#: plugins/admin/ogroups/termgroup.tpl:16
-msgid "Choose server to use for synchronizing time"
-msgstr "Выберите сервер для синхронизации времени"
-
-#: plugins/admin/systems/terminal.tpl:119
-#: plugins/admin/systems/workstation.tpl:97
-#: plugins/admin/ogroups/termgroup.tpl:79
-msgid "Select action to execute for this terminal"
-msgstr "Выберите действие, которое нужно выполнить на этом терминале"
-
-#: plugins/admin/systems/class_servDB.inc:136
-#: plugins/admin/systems/class_servDB.inc:145
-#: plugins/admin/systems/class_servDB.inc:162
-#: plugins/admin/systems/class_servDB.inc:172
-#: plugins/admin/systems/class_servDB.inc:177
-#: plugins/admin/systems/class_servDB.inc:183
-#, fuzzy, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
-
-#: plugins/admin/systems/class_servDB.inc:152
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:156
-msgid "The sieve port needs to be numeric."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:167
-#, fuzzy, php-format
-msgid "The specified kerberos password is empty."
-msgstr "Значение поля \"Файлы\" некорректно."
-
-#: plugins/admin/systems/class_servDB.inc:191
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:245
-#, fuzzy
-msgid "Saving server db settings failed"
-msgstr "Почтовые настройки пользователя"
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, fuzzy, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
-msgstr "Вы собираетесь удалить приложение \"%s\"."
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#, fuzzy
-msgid "New monitor"
-msgstr "Новый пароль"
-
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#, fuzzy
-msgid "M"
-msgstr "Мб"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:92
-#: plugins/admin/systems/class_servGeneric.inc:35
-#: plugins/admin/ogroups/class_termgroup.inc:38
-#, fuzzy
-msgid "Activated"
-msgstr "Личный"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:94
-#: plugins/admin/systems/class_servGeneric.inc:37
-#: plugins/admin/ogroups/class_termgroup.inc:40
-#, fuzzy
-msgid "Memory test"
-msgstr "Память"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:95
-#: plugins/admin/systems/class_servGeneric.inc:38
-#: plugins/admin/ogroups/class_termgroup.inc:41
-#, fuzzy
-msgid "System analysis"
-msgstr "Системные журналы"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:132
-#: plugins/admin/systems/class_servGeneric.inc:69
-#: plugins/admin/ogroups/class_termgroup.inc:154
-#, fuzzy
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:136
-#: plugins/admin/systems/class_terminalGeneric.inc:132
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_terminalGeneric.inc:156
-#: plugins/admin/systems/class_servGeneric.inc:73
-#: plugins/admin/ogroups/class_termgroup.inc:158
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr "Ошибка при выполнении \"%s\"!"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:146
-msgid "This 'dn' has no workstation features."
-msgstr "Это DN не содержит атрибутоов рабочей станции."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:201
-#: plugins/admin/systems/class_terminalGeneric.inc:223
-#: plugins/admin/systems/class_servGeneric.inc:125
-#: plugins/admin/ogroups/class_termgroup.inc:204
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Switch off"
-msgstr "Выключить"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:201
-#: plugins/admin/systems/class_terminalGeneric.inc:223
-#: plugins/admin/systems/class_servGeneric.inc:125
-#: plugins/admin/ogroups/class_termgroup.inc:205
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Reboot"
-msgstr "Перезагрузить"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:202
-#: plugins/admin/systems/class_servGeneric.inc:126
-#: plugins/admin/ogroups/class_termgroup.inc:206
-#, fuzzy
-msgid "Instant update"
-msgstr "Создать телефонный аккаунт"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:203
-#: plugins/admin/systems/class_workstationGeneric.inc:209
-#: plugins/admin/systems/class_servGeneric.inc:127
-#: plugins/admin/systems/class_servGeneric.inc:133
-#: plugins/admin/ogroups/class_termgroup.inc:207
-#, fuzzy
-msgid "Scheduled update"
-msgstr "Выберите режим терминала"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:204
-#: plugins/admin/systems/class_workstationGeneric.inc:208
-#: plugins/admin/systems/class_servGeneric.inc:128
-#: plugins/admin/systems/class_servGeneric.inc:132
-#: plugins/admin/ogroups/class_termgroup.inc:208
-msgid "Reinstall"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:205
-#: plugins/admin/systems/class_servGeneric.inc:129
-#: plugins/admin/ogroups/class_termgroup.inc:209
-#, fuzzy
-msgid "Rescan hardware"
-msgstr "Телефонное оборудование"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:207
-#: plugins/admin/systems/class_terminalGeneric.inc:225
-#: plugins/admin/systems/class_servGeneric.inc:131
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Wake up"
-msgstr "Вернуть в обычный режим"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:237
-#, fuzzy
-msgid "Removing workstation failed"
-msgstr "Удалить приложения"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:106
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:292
-msgid "The required field 'Workstation name' is not set."
-msgstr "Обязательное поле 'Название рабочей станции' не заполнено."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:305
-#: plugins/admin/systems/class_componentGeneric.inc:165
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:352
-#: plugins/admin/systems/class_servGeneric.inc:202
-#: plugins/admin/systems/class_printGeneric.inc:613
-#: plugins/admin/systems/class_phoneGeneric.inc:312
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "В выбранной вами ветке уже есть запись \"%s\""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:315
-#: plugins/admin/systems/class_terminalGeneric.inc:362
-msgid ""
-"There must be at least one NTP server selected, or the inherit mode "
-"activated."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/ogroups/class_termgroup.inc:290
-#, fuzzy
-msgid "Saving workstation failed"
-msgstr "Приложение"
-
-#: plugins/admin/systems/class_divListSystem.inc:37
-#: plugins/admin/systems/class_divListSystem.inc:38
-msgid "List of systems"
-msgstr "Список систем"
-
-#: plugins/admin/systems/class_divListSystem.inc:42
-#, fuzzy
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять свойства "
-"отдельных систем. Вы можете только добавлять системы которые однажды уже "
-"были запущены."
-
-#: plugins/admin/systems/class_divListSystem.inc:52
-#, fuzzy
-msgid "System / Department"
-msgstr "Подразделение"
-
-#: plugins/admin/systems/class_divListSystem.inc:56
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Показать серверы"
-
-#: plugins/admin/systems/class_divListSystem.inc:57
-#, fuzzy
-msgid "Select to see Linux terminals"
-msgstr "Выберите чтобы посмотреть терминалы"
-
-#: plugins/admin/systems/class_divListSystem.inc:57
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Показать терминалы"
-
-#: plugins/admin/systems/class_divListSystem.inc:58
-#, fuzzy
-msgid "Select to see Linux workstations"
-msgstr "Выберите чтобы посмотреть рабочие станции"
-
-#: plugins/admin/systems/class_divListSystem.inc:58
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Показать рабочие станции"
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr "Частота обновления строк для данного монитора"
 
-#: plugins/admin/systems/class_divListSystem.inc:59
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Посмотреть рабочие станции с MicroSoft Windows"
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr "Кадровая синхронизация"
 
-#: plugins/admin/systems/class_divListSystem.inc:59
-msgid "Show windows based workstations"
-msgstr "Показать рабочие станции с windows"
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr "Частота обновления кадров для данного монитора"
 
-#: plugins/admin/systems/class_divListSystem.inc:60
-msgid "Select to see network printers"
-msgstr "Выберите чтобы посмотреть сетевые принтеры"
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr "Устройство сканирования"
 
-#: plugins/admin/systems/class_divListSystem.inc:60
-msgid "Show network printers"
-msgstr "Показать сетевые принтеры"
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr "Выберите, чтобы запустить на терминале службу сканирования"
 
-#: plugins/admin/systems/class_divListSystem.inc:61
-msgid "Select to see VOIP phones"
-msgstr "Выберите чтобы посмотреть VOIP телефоны"
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr "Предоставлять службу сканирования"
 
-#: plugins/admin/systems/class_divListSystem.inc:61
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Показать телефоны"
+#: plugins/admin/systems/class_workstationStartup.inc:306
+#: plugins/admin/systems/class_terminalStartup.inc:93
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: plugins/admin/systems/class_divListSystem.inc:62
-#, fuzzy
-msgid "Select to see network devices"
-msgstr "Выберите чтобы посмотреть сетевые принтеры"
+#: plugins/admin/systems/class_workstationStartup.inc:413
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/systems/class_workstationStartup.inc:458
 #, fuzzy
-msgid "Show network devices"
-msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она!"
 
-#: plugins/admin/systems/class_divListSystem.inc:70
+#: plugins/admin/systems/class_workstationStartup.inc:516
 #, fuzzy
-msgid "Display systems of user"
-msgstr "Показать адреса пользователя"
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configurations."
+msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/class_divListSystem.inc:96
-#, fuzzy
-msgid "New Terminal template"
-msgstr "Шаблон терминала"
+#: plugins/admin/systems/class_workstationStartup.inc:856
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:96
-#: plugins/admin/systems/class_systemManagement.inc:749
-#, fuzzy
-msgid "New Terminal"
-msgstr "Создать терминал"
+#: plugins/admin/systems/class_workstationStartup.inc:867
+#, php-format
+msgid ""
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. !All classes "
+"have been removed from this account, press cancel if you don't want this to "
+"be saved."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_workstationStartup.inc:1030
 #, fuzzy
-msgid "New Workstation template"
+msgid "Saving workstation startup settings failed"
 msgstr "Шаблон рабочей станции"
 
-#: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/systems/class_systemManagement.inc:750
-#, fuzzy
-msgid "New Workstation"
-msgstr "Ð\9dоваÑ\8f Ñ\80абоÑ\87аÑ\8f Ñ\81Ñ\82анÑ\86иÑ\8f"
+#: plugins/admin/systems/class_workstationStartup.inc:1080
+#, fuzzy, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+msgstr "Ð\9dе Ñ\83даеÑ\82Ñ\81Ñ\8f подклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f к базе жÑ\83Ñ\80налов, оÑ\82Ñ\87еÑ\82Ñ\8b показанÑ\8b не бÑ\83дÑ\83Ñ\82!"
 
-#: plugins/admin/systems/class_divListSystem.inc:99
-#: plugins/admin/systems/class_divListSystem.inc:100
-#, fuzzy
-msgid "New Server"
-msgstr "Сервер"
+#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/systems/class_servRepositorySetup.inc:172
+#, php-format
+msgid ""
+"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:101
-#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_terminalStartup.inc:386
 #, fuzzy
-msgid "New Printer"
-msgstr "Принтер"
+msgid "Saving terminal startup settings failed"
+msgstr "Почтовые настройки пользователя"
 
-#: plugins/admin/systems/class_divListSystem.inc:103
-#: plugins/admin/systems/class_divListSystem.inc:104
-#, fuzzy
-msgid "New Phone"
-msgstr "Телефон"
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:105
-#: plugins/admin/systems/class_divListSystem.inc:106
+#: plugins/admin/systems/class_printerPPDDialog.inc:87
 #, fuzzy
-msgid "New Component"
-msgstr "Ð\9fÑ\80оÑ\87ие Ñ\81еÑ\82евÑ\8bе компоненÑ\82Ñ\8b"
+msgid "Can't get ppd informations."
+msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
 
-#: plugins/admin/systems/class_divListSystem.inc:123
+#: plugins/admin/systems/class_printerPPDDialog.inc:99
+#, php-format
+msgid ""
+"The specified path '%s' which results from PPD_PATH in your gosa.conf is "
+"invalid, can't read/write any ppd informations."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
 #, fuzzy
-msgid "Cups Server"
-msgstr "СеÑ\80веÑ\80"
+msgid "Please specify a valid ppd file."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f!"
 
-#: plugins/admin/systems/class_divListSystem.inc:124
-msgid "Log Db"
+#: plugins/admin/systems/class_printerPPDDialog.inc:186
+#, php-format
+msgid "Can't select PPD file '%s', the file is not readable"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:125
-#, fuzzy
-msgid "Syslog Server"
-msgstr "Сервер системных журналов"
+#: plugins/admin/systems/class_printerPPDDialog.inc:203
+#: plugins/admin/systems/class_printerPPDDialog.inc:275
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:126
-#, fuzzy
-msgid "Mail Server"
-msgstr "СеÑ\80веÑ\80"
+#: plugins/admin/systems/class_printerPPDDialog.inc:211
+#, fuzzy, php-format
+msgid "Can't create file '%s' to store modifed ppd informations."
+msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
 
-#: plugins/admin/systems/class_divListSystem.inc:127
-#, fuzzy
-msgid "Imap Server"
-msgstr "Сервер подкачки"
+#: plugins/admin/systems/class_printerPPDDialog.inc:235
+#, php-format
+msgid "Can't add new ppd file, the source file '%s' is not accessible."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:128
-#, fuzzy
-msgid "Nfs Server"
-msgstr "Сервер"
+#: plugins/admin/systems/class_printerPPDDialog.inc:253
+#, fuzzy, php-format
+msgid ""
+"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
+"informations."
+msgstr ""
+"Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
+"права доступа к общим папкам."
 
-#: plugins/admin/systems/class_divListSystem.inc:129
-#, fuzzy
-msgid "Kerberos Server"
-msgstr "Kerberos"
+#: plugins/admin/systems/class_printerPPDDialog.inc:267
+#, fuzzy, php-format
+msgid "There is already a ppd file for this kind of printer."
+msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/class_divListSystem.inc:130
-#, fuzzy
-msgid "Asterisk Server"
-msgstr "ТеÑ\80миналÑ\8cнÑ\8bй Ñ\81еÑ\80веÑ\80"
+#: plugins/admin/systems/class_printerPPDDialog.inc:288
+#, fuzzy, php-format
+msgid "Can't save file '%s'."
+msgstr "УдалиÑ\82Ñ\8c"
 
-#: plugins/admin/systems/class_divListSystem.inc:131
-#, fuzzy
-msgid "Fax Server"
-msgstr "Сервер"
+#: plugins/admin/systems/class_printerPPDDialog.inc:292
+msgid "Uploaded ppd file is empty, can't create new ppd file."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:132
+#: plugins/admin/systems/class_printerPPDDialog.inc:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
 #, fuzzy
-msgid "Ldap Server"
-msgstr "СеÑ\80веÑ\80 подкаÑ\87ки"
+msgid "True"
+msgstr "УлиÑ\86а"
 
-#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
 #, fuzzy
-msgid "Edit system"
-msgstr "СпиÑ\81ок Ñ\81иÑ\81Ñ\82ем"
+msgid "False"
+msgstr "женÑ\81кий"
 
-#: plugins/admin/systems/class_divListSystem.inc:136
-#, fuzzy
-msgid "Delete system"
-msgstr "Удалить"
+#: plugins/admin/systems/class_printerPPDDialog.inc:471
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:169
-#, fuzzy
-msgid "Set root       password"
-msgstr "Изменить пароль"
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Имя сервера"
 
-#: plugins/admin/systems/servdns.tpl:1
-#, fuzzy
-msgid "Zones"
-msgstr "телефоны"
+#: plugins/admin/systems/server.tpl:17 plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/workstation.tpl:25
+#: plugins/admin/systems/component.tpl:15
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Выберите ветку терминала"
 
-#: plugins/admin/systems/workstation.tpl:8
-msgid "Workstation template"
-msgstr "Шаблон рабочей станции"
+#: plugins/admin/systems/server.tpl:32 plugins/admin/systems/terminal.tpl:34
+#: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/ogroups/termgroup.tpl:38
+msgid "Mode"
+msgstr "Режим"
 
-#: plugins/admin/systems/workstation.tpl:10
-msgid "Workstation name"
-msgstr "Имя рабочий станции"
+#: plugins/admin/systems/server.tpl:34 plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:41
+#: plugins/admin/ogroups/termgroup.tpl:40
+msgid "Select terminal mode"
+msgstr "Выберите режим терминала"
+
+#: plugins/admin/systems/server.tpl:50 plugins/admin/systems/terminal.tpl:115
+#: plugins/admin/systems/workstation.tpl:93
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:75
+msgid "Action"
+msgstr "Действие"
+
+#: plugins/admin/systems/server.tpl:54
+#, fuzzy
+msgid "Select action to execute for this server"
+msgstr "Выберите действие, которое нужно выполнить на этом терминале"
+
+#: plugins/admin/systems/printer.tpl:6
+#, fuzzy
+msgid "General"
+msgstr "Общее"
 
-#: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Имя принтера"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:49
+#: plugins/admin/systems/printer.tpl:39
 #, fuzzy
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "УдалиÑ\82Ñ\8c"
+msgid "Printer location"
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Ñ\82елеÑ\84она"
 
-#: plugins/admin/systems/class_servNfs.inc:179
-#, fuzzy
-msgid "Please specify a valid path for your setup."
-msgstr "Укажите корректный номер телефона."
+#: plugins/admin/systems/printer.tpl:43
+msgid "Printer URL"
+msgstr "URL принтера"
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/printer.tpl:63
 #, fuzzy
-msgid "Please specify a valid name for your share."
-msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+msgid "Permissions"
+msgstr "Ð\9fÑ\80ава длÑ\8f Ñ\87ленов гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/printer.tpl:70
 #, fuzzy
-msgid "Please specify a name for your share."
-msgstr "Укажите корректный номер телефона."
+msgid "Users which are allowed to use this printer"
+msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
 #, fuzzy
-msgid "Description contains invalid characters."
-msgstr "Ð\9dепÑ\80авилÑ\8cное Ñ\83казание Ñ\82аймаÑ\83Ñ\82а '%s'"
+msgid "Add user"
+msgstr "Ð\9fолÑ\8cзоваÑ\82ели домена"
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
 #, fuzzy
-msgid "Volume contains invalid characters."
-msgstr "Ð\9dепÑ\80авилÑ\8cное Ñ\83казание Ñ\82аймаÑ\83Ñ\82а '%s'"
+msgid "Add group"
+msgstr "гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/printer.tpl:86
 #, fuzzy
-msgid "Path contains invalid characters."
-msgstr "Ð\97наÑ\87ение полÑ\8f \"Ð\98мÑ\8f\" Ñ\81одеÑ\80жиÑ\82 недопÑ\83Ñ\81Ñ\82имÑ\8bе Ñ\81имволÑ\8b."
+msgid "Users which are allowed to administrate this printer"
+msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\83далениÑ\8f Ñ\8dÑ\82ого обÑ\8aекÑ\82а!"
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/printer.tpl:87
 #, fuzzy
-msgid "Option contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
+msgid "Admins"
+msgstr "DN администратора"
 
-#: plugins/admin/systems/servnfs.tpl:1
-#, fuzzy
-msgid "Edit share"
-msgstr "Ð\9fолÑ\8cзоваÑ\82ели домена"
+#: plugins/admin/systems/workstationStartup.tpl:4
+#: plugins/admin/systems/terminalStartup.tpl:1
+msgid "Boot parameters"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b загÑ\80Ñ\83зки"
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:13
+msgid "Boot kernel"
+msgstr "Ядро для загрузки"
 
-#: plugins/admin/systems/servnfs.tpl:33
-#, fuzzy
-msgid "Volume"
-msgstr "Ð\98мÑ\8f Ñ\81иÑ\81Ñ\82емы"
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "Custom options"
+msgstr "Ð\94ополниÑ\82елÑ\8cнÑ\8bе паÑ\80амеÑ\82Ñ\80ы"
 
-#: plugins/admin/systems/servnfs.tpl:54
-msgid "Auto-mount share on Apple systems"
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:24
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
 msgstr ""
+"Введите любые дополнительные параметры, которые должны передаваться ядру во "
+"время загрузки"
 
-#: plugins/admin/systems/servnfs.tpl:88
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/workstationStartup.tpl:41
+#: plugins/admin/systems/workstationStartup.tpl:71
 #, fuzzy
-msgid "Codepage"
-msgstr "Домашняя страница"
+msgid "FAI server"
+msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/servnfs.tpl:98
+#: plugins/admin/systems/workstationStartup.tpl:63
+#: plugins/admin/systems/workstationStartup.tpl:95
 #, fuzzy
-msgid "Option"
-msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b"
+msgid "Assigned FAI classes"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
 
-#: plugins/admin/systems/class_servKolab.inc:107
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:85
+#, fuzzy
+msgid "set"
+msgstr "сброс"
 
-#: plugins/admin/systems/class_servKolab.inc:113
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/workstationStartup.tpl:116
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Модули ядра (формат: имя параметры)"
+
+#: plugins/admin/systems/workstationStartup.tpl:118
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
 msgstr ""
+"Укажите дополнительные модули, которые должны загружаться при запуске системы"
 
-#: plugins/admin/systems/class_servKolab.inc:128
+#: plugins/admin/systems/workstationStartup.tpl:142
+#: plugins/admin/systems/terminalStartup.tpl:79
 #, fuzzy
-msgid "Remove Kolab extension"
-msgstr "УдалиÑ\82Ñ\8c паÑ\80амеÑ\82Ñ\80Ñ\8b"
+msgid "Mountpoint"
+msgstr "Ð\9cониÑ\82оÑ\80инг"
 
-#: plugins/admin/systems/class_servKolab.inc:128
+#: plugins/admin/systems/class_servDNS.inc:67
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr "Удалить сервис DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:68
+#: plugins/admin/systems/class_inventory.inc:37
 #, fuzzy
 msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:131
-#, fuzzy
-msgid "Add Kolab service"
+#: plugins/admin/systems/class_servDNS.inc:70
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
 msgstr "Добавить сервис DNS"
 
-#: plugins/admin/systems/class_servKolab.inc:131
+#: plugins/admin/systems/class_servDNS.inc:71
+#: plugins/admin/systems/class_inventory.inc:40
 #, fuzzy
 msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:212
-#, fuzzy
-msgid "Removing kolab host entry failed"
-msgstr "Показать объекты адресной книги"
-
-#: plugins/admin/systems/class_servKolab.inc:228
+#: plugins/admin/systems/class_servDNS.inc:159
 #, fuzzy
-msgid "Removing server from kolab object failed"
-msgstr "Удалить телефонный аккаунт"
-
-#: plugins/admin/systems/class_servKolab.inc:267
-msgid "Future days in Free/Busy settings must be set."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:269
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:273
-msgid "The given Quota settings value must be a number."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:275
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:277
-msgid "Future days must be a value."
-msgstr ""
+msgid "Reverse zone"
+msgstr "Ссылки"
 
-#: plugins/admin/systems/class_servKolab.inc:281
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/class_servDNS.inc:223
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:364
+#: plugins/admin/systems/class_servDNS.inc:261
 #, fuzzy
-msgid "Saving server to kolab object failed"
-msgstr "Моя учетная запись"
-
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Удаленная рабочая станция"
-
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Способ подключения"
-
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Выберите способ подключения к серверу терминалов"
-
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Терминал-сервер"
-
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Выберите сервер терминалов"
-
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
-msgstr "Сервер шрифтов"
-
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
-msgstr "Выберите сервер шрифтов"
-
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
-msgstr "Устройство печати"
+msgid "Removing DNS service failed"
+msgstr "Удалить сервис DNS"
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
-msgstr "Выберите, чтобы запустить на терминале службу печати по протоколу IPP"
+#: plugins/admin/systems/class_servDNS.inc:282
+#, fuzzy
+msgid "Updating DNS service failed"
+msgstr "Удалить сервис DNS"
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Предоставлять службу печати"
+#: plugins/admin/systems/class_servDNS.inc:291
+#, fuzzy
+msgid "Removing DNS entries failed"
+msgstr "Удалить сервис DNS"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Сервер для хранения запросов и временных файлов"
+#: plugins/admin/systems/class_servDNS.inc:312
+#, fuzzy
+msgid "Saving DNS entries failed"
+msgstr "UNIX аккаунт"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr "Выберите файловую систему NFS для хранения временных файлов"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#, fuzzy
+msgid "List of devices"
+msgstr "Список пользователей"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Выберите драйвер для используемого сканера"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:50
-#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
 #, fuzzy
-msgid "This 'dn' has no network features."
-msgstr "ЭÑ\82оÑ\82 DN не имееÑ\82 Ñ\81войÑ\81Ñ\82в пÑ\80инÑ\82еÑ\80а."
+msgid "Display devices matching"
+msgstr "Ð\9fоказаÑ\82Ñ\8c подÑ\85одÑ\8fÑ\88ие адÑ\80еÑ\81а"
 
-#: plugins/admin/systems/class_componentGeneric.inc:101
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
 #, fuzzy
-msgid "Removing generic component failed"
-msgstr "Ð\9fоказаÑ\82Ñ\8c подÑ\80азделениÑ\8f"
+msgid "Regular expression for matching device names"
+msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам полÑ\8cзоваÑ\82елей"
 
-#: plugins/admin/systems/class_componentGeneric.inc:139
-#, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
+#: plugins/admin/systems/class_servService.inc:320
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:144
-#: plugins/admin/systems/class_phoneGeneric.inc:284
+#: plugins/admin/systems/class_servService.inc:379
 #, fuzzy
-msgid "The required field IP address is empty."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eÑ\81новной адÑ\80еÑ\81\" не заполнено."
+msgid "Saving server service object failed"
+msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82Ñ\8b UNIX"
 
-#: plugins/admin/systems/class_componentGeneric.inc:147
-#: plugins/admin/systems/class_phoneGeneric.inc:287
+#: plugins/admin/systems/class_servService.inc:410
 #, fuzzy
-msgid "The field IP address contains an invalid address."
-msgstr "Ð\97наÑ\87ение полÑ\8f \"Ð\98мÑ\8f\" Ñ\81одеÑ\80жиÑ\82 недопÑ\83Ñ\81Ñ\82имÑ\8bе Ñ\81имволÑ\8b."
+msgid "Creating mount container failed"
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_winGeneric.inc:164
+#: plugins/admin/systems/class_servService.inc:424
 #, fuzzy
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
+msgid "Removing mount container failed"
+msgstr "Удалить настройки эл. почты"
 
-#: plugins/admin/systems/class_componentGeneric.inc:223
+#: plugins/admin/systems/class_servService.inc:436
 #, fuzzy
-msgid "Saving generic component failed"
-msgstr "Ð\9fоказаÑ\82Ñ\8c подÑ\80азделениÑ\8f"
+msgid "Saving mount container failed"
+msgstr "УдалиÑ\82Ñ\8c наÑ\81Ñ\82Ñ\80ойки Ñ\8dл. поÑ\87Ñ\82Ñ\8b"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
 msgstr ""
-"Выберите, должен ли терминал подерживать загрузку в графическом режиме с "
-"показом индикатора состояния"
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "Загружать в графическом режиме"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
+#, fuzzy
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Выберите, должен ли терминал загружаться в текстовом режиме"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
+#, fuzzy
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "Загружать в стандартном текстовом режиме"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:565
+#, fuzzy
+msgid "Remove inventory"
+msgstr "Удалить объект"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#, fuzzy
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"Выберите, нужно ли использовать подробный вывод информации при загрузке"
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "Используйте отладочный режим"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:568
+#, fuzzy
+msgid "Add inventory"
+msgstr "Добавить объект"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:3
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#, fuzzy
 msgid ""
-"This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry and press the 'continue' button. If this "
-"system should be added to a group of system settings, specify the preferred "
-"object group below."
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/SelectDeviceType.tpl:9
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
 msgid ""
-"Please select a system type and an optional bundle of predefined settings to "
-"be inherited."
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:21
-#, fuzzy
-msgid "Choose a system type"
-msgstr "Выберите тип мыши"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:32
-#, fuzzy
-msgid "Choose an object group as template"
-msgstr "Объект группы"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
+#: plugins/admin/systems/class_glpiAccount.inc:633
+#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
+msgid "N/A"
+msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:33
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
 #, fuzzy
-msgid "Choose an object group"
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
+msgid "since"
+msgstr "РабоÑ\82аеÑ\82 Ñ\81"
 
-#: plugins/admin/systems/class_terminalService.inc:375
-#, fuzzy
-msgid "Saving terminal service information failed"
-msgstr "Информация об организации"
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
-msgstr ""
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "Терминал"
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
-msgstr ""
+#: plugins/admin/systems/terminal.tpl:42
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:47
+msgid "Syslog server"
+msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
-#, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
-msgstr ""
+#: plugins/admin/systems/terminal.tpl:44
+#: plugins/admin/systems/workstation.tpl:49
+#: plugins/admin/ogroups/termgroup.tpl:49
+msgid "Choose server to use for logging"
+msgstr "Выберите сервер для ведения системных журналов"
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
-#, fuzzy
-msgid "Rename failed, this system type name is already used."
-msgstr "Указанное имя уже используется."
+#: plugins/admin/systems/terminal.tpl:59
+msgid "Root server"
+msgstr "Основной сервер"
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
-#, fuzzy
-msgid "Adding new operating system failed, specifed name is already used."
-msgstr "Группа с таким именем уже существует."
+#: plugins/admin/systems/terminal.tpl:61
+msgid "Select NFS root filesystem to use"
+msgstr "Выберите корневую файловую систему NFS"
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
-#, php-format
-msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
+#: plugins/admin/systems/terminal.tpl:67
+msgid "Swap server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "Выберите файловую систему NFS для файлов подкачки"
+
+#: plugins/admin/systems/terminal.tpl:86
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Inherit time server attributes"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
-#, fuzzy
-msgid "Updating operating system failed, specifed name is already used."
-msgstr "Группа с таким именем уже существует."
+#: plugins/admin/systems/terminal.tpl:90
+#: plugins/admin/systems/workstation.tpl:69
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "Сервер NTP"
 
-#: plugins/admin/systems/class_glpiAccount.inc:566
+#: plugins/admin/systems/terminal.tpl:92
+#: plugins/admin/systems/workstation.tpl:71
+#: plugins/admin/ogroups/termgroup.tpl:16
+msgid "Choose server to use for synchronizing time"
+msgstr "Выберите сервер для синхронизации времени"
+
+#: plugins/admin/systems/terminal.tpl:119
+#: plugins/admin/systems/workstation.tpl:97
+#: plugins/admin/ogroups/termgroup.tpl:79
+msgid "Select action to execute for this terminal"
+msgstr "Выберите действие, которое нужно выполнить на этом терминале"
+
+#: plugins/admin/systems/servRepositorySetup.tpl:8
 #, fuzzy
-msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+msgid "Parent server"
+msgstr "Служба печати"
 
-#: plugins/admin/systems/class_glpiAccount.inc:569
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+#: plugins/admin/systems/class_servRepository.inc:249
+#: plugins/admin/systems/class_servRepository.inc:270
 #, fuzzy
-msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Sections"
+msgstr "Действие"
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Выбрать объекты для добавления"
 
-#: plugins/admin/systems/class_glpiAccount.inc:667
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Название"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/ogroups/class_termgroup.inc:38
 #, fuzzy
-msgid "Can't remove glpi account, while mysql extension is missing."
-msgstr "Ð\9dе Ñ\83даеÑ\82Ñ\81Ñ\8f подклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f к базе жÑ\83Ñ\80налов, оÑ\82Ñ\87еÑ\82Ñ\8b показанÑ\8b не бÑ\83дÑ\83Ñ\82!"
+msgid "Activated"
+msgstr "Ð\9bиÑ\87нÑ\8bй"
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
+#: plugins/admin/systems/class_workstationGeneric.inc:94
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/ogroups/class_termgroup.inc:40
 #, fuzzy
-msgid "Manage manufacturers"
-msgstr "РедакÑ\82иоваÑ\82Ñ\8c обÑ\8aекÑ\82"
+msgid "Memory test"
+msgstr "Ð\9fамÑ\8fÑ\82Ñ\8c"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+#: plugins/admin/systems/class_workstationGeneric.inc:95
+#: plugins/admin/systems/class_servGeneric.inc:38
+#: plugins/admin/ogroups/class_termgroup.inc:41
 #, fuzzy
-msgid "Attachment"
-msgstr "подÑ\80азделениÑ\8f"
+msgid "System analysis"
+msgstr "СиÑ\81Ñ\82емнÑ\8bе жÑ\83Ñ\80налÑ\8b"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+#: plugins/admin/systems/class_workstationGeneric.inc:132
+#: plugins/admin/systems/class_servGeneric.inc:69
+#: plugins/admin/ogroups/class_termgroup.inc:154
 #, fuzzy
-msgid "Filename"
-msgstr "Ð\98мÑ\8f Ñ\81еÑ\80веÑ\80а"
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr "Ð\9eпÑ\80еделение HALTCMD в ваÑ\88ем Ñ\84айле gosa.conf не найдено"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:136
+#: plugins/admin/systems/class_terminalGeneric.inc:132
+#: plugins/admin/systems/class_terminalGeneric.inc:144
+#: plugins/admin/systems/class_terminalGeneric.inc:156
+#: plugins/admin/systems/class_servGeneric.inc:73
+#: plugins/admin/ogroups/class_termgroup.inc:158
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "Ошибка при выполнении \"%s\"!"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:146
+msgid "This 'dn' has no workstation features."
+msgstr "Это DN не содержит атрибутоов рабочей станции."
+
+#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_terminalGeneric.inc:223
+#: plugins/admin/systems/class_servGeneric.inc:125
+#: plugins/admin/ogroups/class_termgroup.inc:204
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Switch off"
+msgstr "Выключить"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_terminalGeneric.inc:223
+#: plugins/admin/systems/class_servGeneric.inc:125
+#: plugins/admin/ogroups/class_termgroup.inc:205
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Reboot"
+msgstr "Перезагрузить"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:202
+#: plugins/admin/systems/class_servGeneric.inc:126
+#: plugins/admin/ogroups/class_termgroup.inc:206
 #, fuzzy
-msgid "Mime-type"
-msgstr "Тип"
+msgid "Instant update"
+msgstr "СоздаÑ\82Ñ\8c Ñ\82елеÑ\84оннÑ\8bй аккаÑ\83нÑ\82"
 
-#: plugins/admin/systems/class_termDNS.inc:265
+#: plugins/admin/systems/class_workstationGeneric.inc:203
+#: plugins/admin/systems/class_workstationGeneric.inc:209
+#: plugins/admin/systems/class_servGeneric.inc:127
+#: plugins/admin/systems/class_servGeneric.inc:133
+#: plugins/admin/ogroups/class_termgroup.inc:207
 #, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eÑ\81новной адÑ\80еÑ\81\" не заполнено."
+msgid "Scheduled update"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\80ежим Ñ\82еÑ\80минала"
 
-#: plugins/admin/systems/class_termDNS.inc:272
-msgid "Wrong IP format in field IP-address."
+#: plugins/admin/systems/class_workstationGeneric.inc:204
+#: plugins/admin/systems/class_workstationGeneric.inc:208
+#: plugins/admin/systems/class_servGeneric.inc:128
+#: plugins/admin/systems/class_servGeneric.inc:132
+#: plugins/admin/ogroups/class_termgroup.inc:208
+msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:279
+#: plugins/admin/systems/class_workstationGeneric.inc:205
+#: plugins/admin/systems/class_servGeneric.inc:129
+#: plugins/admin/ogroups/class_termgroup.inc:209
 #, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eÑ\81новной адÑ\80еÑ\81\" не заполнено."
+msgid "Rescan hardware"
+msgstr "ТелеÑ\84онное обоÑ\80Ñ\83дование"
 
-#: plugins/admin/systems/class_termDNS.inc:286
-msgid ""
-"The given macaddress is invalid. There must be 6 2byte segments seperated by "
-"':'."
-msgstr ""
+#: plugins/admin/systems/class_workstationGeneric.inc:207
+#: plugins/admin/systems/class_terminalGeneric.inc:225
+#: plugins/admin/systems/class_servGeneric.inc:131
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Wake up"
+msgstr "Вернуть в обычный режим"
 
-#: plugins/admin/systems/class_termDNS.inc:306
-#, php-format
-msgid "Found duplicate value for record type '%s'."
-msgstr ""
+#: plugins/admin/systems/class_workstationGeneric.inc:237
+#, fuzzy
+msgid "Removing workstation failed"
+msgstr "Удалить приложения"
 
-#: plugins/admin/systems/class_termDNS.inc:314
-#, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
-msgstr ""
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:106
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
 
-#: plugins/admin/systems/class_termDNS.inc:325
-#, php-format
-msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
-msgstr ""
+#: plugins/admin/systems/class_workstationGeneric.inc:292
+msgid "The required field 'Workstation name' is not set."
+msgstr "Обязательное поле 'Название рабочей станции' не заполнено."
 
-#: plugins/admin/systems/class_termDNS.inc:332
-#: plugins/admin/systems/class_servDNSeditZone.inc:409
+#: plugins/admin/systems/class_workstationGeneric.inc:305
+#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_printGeneric.inc:613
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_terminalGeneric.inc:352
+#: plugins/admin/systems/class_servGeneric.inc:202
+#: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "В выбранной вами ветке уже есть запись \"%s\""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:315
+#: plugins/admin/systems/class_terminalGeneric.inc:362
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:415
+#: plugins/admin/systems/class_workstationGeneric.inc:382
+#: plugins/admin/systems/class_workstationGeneric.inc:400
+#: plugins/admin/ogroups/class_termgroup.inc:290
 #, fuzzy
-msgid "Saving terminal to DNS object failed"
-msgstr "СпиÑ\81ок подÑ\80азделений"
+msgid "Saving workstation failed"
+msgstr "Ð\9fÑ\80иложение"
 
-#: plugins/admin/systems/class_servRepository.inc:97
-#, fuzzy
-msgid "Remove FAI repository extension."
-msgstr "УдалиÑ\82Ñ\8c паÑ\80амеÑ\82Ñ\80Ñ\8b"
+#: plugins/admin/systems/class_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
+msgstr "СпиÑ\81ок Ñ\81иÑ\81Ñ\82ем"
 
-#: plugins/admin/systems/class_servRepository.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:42
 #, fuzzy
 msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять свойства "
+"отдельных систем. Вы можете только добавлять системы которые однажды уже "
+"были запущены."
 
-#: plugins/admin/systems/class_servRepository.inc:101
+#: plugins/admin/systems/class_divListSystem.inc:52
 #, fuzzy
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "System / Department"
+msgstr "Подразделение"
 
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:56
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Показать серверы"
 
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:57
+#, fuzzy
+msgid "Select to see Linux terminals"
+msgstr "Выберите чтобы посмотреть терминалы"
 
-#: plugins/admin/systems/class_servRepository.inc:249
-#: plugins/admin/systems/class_servRepository.inc:270
-#: plugins/admin/systems/servRepositorySetup.tpl:33
+#: plugins/admin/systems/class_divListSystem.inc:57
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Показать терминалы"
+
+#: plugins/admin/systems/class_divListSystem.inc:58
 #, fuzzy
-msgid "Sections"
-msgstr "Ð\94ейÑ\81Ñ\82вие"
+msgid "Select to see Linux workstations"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\87Ñ\82обÑ\8b поÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\80абоÑ\87ие Ñ\81Ñ\82анÑ\86ии"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:58
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Показать рабочие станции"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
+#: plugins/admin/systems/class_divListSystem.inc:59
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Посмотреть рабочие станции с MicroSoft Windows"
+
+#: plugins/admin/systems/class_divListSystem.inc:59
+msgid "Show windows based workstations"
+msgstr "Показать рабочие станции с windows"
+
+#: plugins/admin/systems/class_divListSystem.inc:60
+msgid "Select to see network printers"
+msgstr "Выберите чтобы посмотреть сетевые принтеры"
+
+#: plugins/admin/systems/class_divListSystem.inc:60
+msgid "Show network printers"
+msgstr "Показать сетевые принтеры"
+
+#: plugins/admin/systems/class_divListSystem.inc:61
+msgid "Select to see VOIP phones"
+msgstr "Выберите чтобы посмотреть VOIP телефоны"
+
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Показать телефоны"
+
+#: plugins/admin/systems/class_divListSystem.inc:62
 #, fuzzy
-msgid "The selected name is already in use."
-msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
+msgid "Select to see network devices"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\87Ñ\82обÑ\8b поÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\81еÑ\82евÑ\8bе пÑ\80инÑ\82еÑ\80Ñ\8b"
 
-#: plugins/admin/systems/servRepository.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:62
 #, fuzzy
-msgid "List of configured repositories."
-msgstr "СпиÑ\81ок гÑ\80Ñ\83пп"
+msgid "Show network devices"
+msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
 
-#: plugins/admin/systems/servRepository.tpl:11
+#: plugins/admin/systems/class_divListSystem.inc:70
 #, fuzzy
-msgid "Add repository"
-msgstr "Ð\9fовÑ\82оÑ\80иÑ\82Ñ\8c"
+msgid "Display systems of user"
+msgstr "Ð\9fоказаÑ\82Ñ\8c адÑ\80еÑ\81а полÑ\8cзоваÑ\82елÑ\8f"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:96
+#, fuzzy
+msgid "New Terminal template"
+msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
+#: plugins/admin/systems/class_divListSystem.inc:98
 #, fuzzy
-msgid "Zone name"
-msgstr "Ð\9dазвание"
+msgid "New Workstation template"
+msgstr "Шаблон Ñ\80абоÑ\87ей Ñ\81Ñ\82анÑ\86ии"
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_divListSystem.inc:100
 #, fuzzy
-msgid "Network address"
-msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
+msgid "New Server"
+msgstr "СеÑ\80веÑ\80"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:101
+#: plugins/admin/systems/class_divListSystem.inc:102
 #, fuzzy
-msgid "Zone records"
-msgstr "Ð\9aаÑ\82алог"
+msgid "New Printer"
+msgstr "Ð\9fÑ\80инÑ\82еÑ\80"
 
-#: plugins/admin/systems/servdnseditzone.tpl:27
-msgid "Can't be edited because the zone wasn't saved right now."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:104
+#, fuzzy
+msgid "New Phone"
+msgstr "Телефон"
 
-#: plugins/admin/systems/servdnseditzone.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:105
+#: plugins/admin/systems/class_divListSystem.inc:106
 #, fuzzy
-msgid "SOA record"
-msgstr "Ð\9aаÑ\82алог"
+msgid "New Component"
+msgstr "Ð\9fÑ\80оÑ\87ие Ñ\81еÑ\82евÑ\8bе компоненÑ\82Ñ\8b"
 
-#: plugins/admin/systems/servdnseditzone.tpl:45
+#: plugins/admin/systems/class_divListSystem.inc:123
 #, fuzzy
-msgid "Primary dns server for this zone"
-msgstr "Ð\9eÑ\81новной адÑ\80еÑ\81 Ñ\8dл. поÑ\87Ñ\82Ñ\8b длÑ\8f Ñ\8dÑ\82ой обÑ\89ей папки"
+msgid "Cups Server"
+msgstr "СеÑ\80веÑ\80"
 
-#: plugins/admin/systems/servdnseditzone.tpl:57
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/class_divListSystem.inc:124
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Повторить"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
+#: plugins/admin/systems/class_divListSystem.inc:125
 #, fuzzy
-msgid "Expire"
-msgstr "ЭкÑ\81поÑ\80Ñ\82"
+msgid "Syslog Server"
+msgstr "СеÑ\80веÑ\80 Ñ\81иÑ\81Ñ\82емнÑ\8bÑ\85 жÑ\83Ñ\80налов"
 
-#: plugins/admin/systems/servdnseditzone.tpl:100
+#: plugins/admin/systems/class_divListSystem.inc:126
 #, fuzzy
-msgid "MxRecords"
-msgstr "Ð\9aаÑ\82алог"
+msgid "Mail Server"
+msgstr "СеÑ\80веÑ\80"
 
-#: plugins/admin/systems/servdnseditzone.tpl:112
+#: plugins/admin/systems/class_divListSystem.inc:127
 #, fuzzy
-msgid "Global zone records"
-msgstr "Ð\9aаÑ\82алог"
+msgid "Imap Server"
+msgstr "СеÑ\80веÑ\80 подкаÑ\87ки"
 
-#: plugins/admin/systems/class_winGeneric.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:128
 #, fuzzy
-msgid "Removing Samba workstation failed"
-msgstr "УдалиÑ\82Ñ\8c Ñ\83Ñ\87еÑ\82нÑ\83Ñ\8e запиÑ\81Ñ\8c Samba"
+msgid "Nfs Server"
+msgstr "СеÑ\80веÑ\80"
 
-#: plugins/admin/systems/class_winGeneric.inc:224
+#: plugins/admin/systems/class_divListSystem.inc:129
 #, fuzzy
-msgid "Saving Samba workstation failed"
-msgstr "Приложение"
+msgid "Kerberos Server"
+msgstr "Kerberos"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:130
 #, fuzzy
-msgid "use"
-msgstr "Мышь"
-
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
-msgstr ""
+msgid "Asterisk Server"
+msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/glpi_devices.tpl:2
+#: plugins/admin/systems/class_divListSystem.inc:131
 #, fuzzy
-msgid "Add/Edit monitor"
-msgstr "РедакÑ\82иоваÑ\82Ñ\8c обÑ\8aекÑ\82"
+msgid "Fax Server"
+msgstr "СеÑ\80веÑ\80"
 
-#: plugins/admin/systems/glpi_devices.tpl:17
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:132
 #, fuzzy
-msgid "Comments"
-msgstr "Ð\9aонÑ\82акÑ\82"
+msgid "Ldap Server"
+msgstr "СеÑ\80веÑ\80 подкаÑ\87ки"
 
-#: plugins/admin/systems/glpi_devices.tpl:33
+#: plugins/admin/systems/class_divListSystem.inc:135
 #, fuzzy
-msgid "Monitor size"
-msgstr "Ð\9cониÑ\82оÑ\80инг"
+msgid "Edit system"
+msgstr "СпиÑ\81ок Ñ\81иÑ\81Ñ\82ем"
 
-#: plugins/admin/systems/glpi_devices.tpl:36
+#: plugins/admin/systems/class_divListSystem.inc:136
 #, fuzzy
-msgid "Inch"
-msgstr "Французский"
-
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
-msgstr ""
+msgid "Delete system"
+msgstr "Удалить"
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
+#: plugins/admin/systems/class_divListSystem.inc:169
 #, fuzzy
-msgid "Yes"
-msgstr "СиÑ\81Ñ\82емÑ\8b"
+msgid "Set root       password"
+msgstr "Ð\98змениÑ\82Ñ\8c паÑ\80олÑ\8c"
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
-#, fuzzy
-msgid "No"
-msgstr "нет"
+#: plugins/admin/systems/class_servDB.inc:136
+#: plugins/admin/systems/class_servDB.inc:145
+#: plugins/admin/systems/class_servDB.inc:162
+#: plugins/admin/systems/class_servDB.inc:172
+#: plugins/admin/systems/class_servDB.inc:177
+#: plugins/admin/systems/class_servDB.inc:183
+#, fuzzy, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
+#: plugins/admin/systems/class_servDB.inc:152
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
+#: plugins/admin/systems/class_servDB.inc:156
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
+#: plugins/admin/systems/class_servDB.inc:167
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "Значение поля \"Файлы\" некорректно."
+
+#: plugins/admin/systems/class_servDB.inc:191
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:76
+#: plugins/admin/systems/class_servDB.inc:245
 #, fuzzy
-msgid "Serial number"
-msgstr "ТеÑ\80минал"
+msgid "Saving server db settings failed"
+msgstr "Ð\9fоÑ\87Ñ\82овÑ\8bе наÑ\81Ñ\82Ñ\80ойки полÑ\8cзоваÑ\82елÑ\8f"
 
-#: plugins/admin/systems/glpi_devices.tpl:83
+#: plugins/admin/systems/servdns.tpl:1
 #, fuzzy
-msgid "Additional serial number"
-msgstr "Серийный номер сертификата"
+msgid "Zones"
+msgstr "телефоны"
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-#, fuzzy
-msgid "Add/Edit other device"
-msgstr "Звуковая карта"
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
+msgstr "Шаблон рабочей станции"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
-msgstr ""
+#: plugins/admin/systems/workstation.tpl:10
+msgid "Workstation name"
+msgstr "Имя рабочий станции"
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
+#: plugins/admin/systems/class_servNfs.inc:46
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:181
+#: plugins/admin/systems/class_servNfs.inc:49
 #, fuzzy
-msgid "Power"
-msgstr "Ð\9fоÑ\80Ñ\82"
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr "УдалиÑ\82Ñ\8c"
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
-msgstr ""
+#: plugins/admin/systems/class_servNfs.inc:179
+#, fuzzy
+msgid "Please specify a valid path for your setup."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
-msgstr ""
+#: plugins/admin/systems/class_servNfs.inc:185
+#, fuzzy
+msgid "Please specify a valid name for your share."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/glpi_devices.tpl:237
+#: plugins/admin/systems/class_servNfs.inc:188
 #, fuzzy
-msgid "Ram"
-msgstr "Ð\98мÑ\8f Ñ\81еÑ\80веÑ\80а"
+msgid "Please specify a name for your share."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/systems/glpi_devices.tpl:249
+#: plugins/admin/systems/class_servNfs.inc:193
 #, fuzzy
-msgid "Add/Edit controller"
-msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
+msgid "Description contains invalid characters."
+msgstr "Ð\9dепÑ\80авилÑ\8cное Ñ\83казание Ñ\82аймаÑ\83Ñ\82а '%s'"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
-msgstr ""
+#: plugins/admin/systems/class_servNfs.inc:197
+#, fuzzy
+msgid "Volume contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/glpi_devices.tpl:342
+#: plugins/admin/systems/class_servNfs.inc:201
 #, fuzzy
-msgid "Speed"
-msgstr "Ð\9fол"
+msgid "Path contains invalid characters."
+msgstr "Ð\97наÑ\87ение полÑ\8f \"Ð\98мÑ\8f\" Ñ\81одеÑ\80жиÑ\82 недопÑ\83Ñ\81Ñ\82имÑ\8bе Ñ\81имволÑ\8b."
 
-#: plugins/admin/systems/glpi_devices.tpl:358
+#: plugins/admin/systems/class_servNfs.inc:205
 #, fuzzy
-msgid "Writeable"
-msgstr "запиÑ\81Ñ\8c"
+msgid "Option contains invalid characters."
+msgstr "Ð\9dепÑ\80авилÑ\8cное Ñ\83казание Ñ\82аймаÑ\83Ñ\82а '%s'"
 
-#: plugins/admin/systems/glpi_devices.tpl:371
+#: plugins/admin/systems/servnfs.tpl:1
 #, fuzzy
-msgid "Add/Edit harddisk"
-msgstr "СеÑ\80веÑ\80"
+msgid "Edit share"
+msgstr "Ð\9fолÑ\8cзоваÑ\82ели домена"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:413
+#: plugins/admin/systems/servnfs.tpl:33
 #, fuzzy
-msgid "Cache"
-msgstr "Ð\9eÑ\82мена"
+msgid "Volume"
+msgstr "Ð\98мÑ\8f Ñ\81иÑ\81Ñ\82емÑ\8b"
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-#, fuzzy
-msgid "Add/Edit memory"
-msgstr "Редактиовать объект"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:478
+#: plugins/admin/systems/servnfs.tpl:88
 #, fuzzy
-msgid "Frequenz"
-msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
+msgid "Codepage"
+msgstr "Ð\94омаÑ\88нÑ\8fÑ\8f Ñ\81Ñ\82Ñ\80аниÑ\86а"
 
-#: plugins/admin/systems/glpi_devices.tpl:507
+#: plugins/admin/systems/servnfs.tpl:98
 #, fuzzy
-msgid "Add/Edit sound card"
-msgstr "Ð\9dовÑ\8bй паÑ\80олÑ\8c"
+msgid "Option"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b"
 
-#: plugins/admin/systems/glpi_devices.tpl:553
+#: plugins/admin/systems/class_servDNSeditZone.inc:351
 #, fuzzy
-msgid "Add/Edit network interface"
-msgstr "СеÑ\82евой пÑ\80инÑ\82еÑ\80"
+msgid "This zoneName is already in use"
+msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
 
-#: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_servDNSeditZone.inc:354
 #, fuzzy
-msgid "MAC address"
-msgstr "MAC-адрес"
+msgid "This reverse zone is already in use"
+msgstr "Указанное имя уже используется."
 
-#: plugins/admin/systems/glpi_devices.tpl:607
-#, fuzzy
-msgid "Add/Edit processor"
-msgstr "Ð\9dовÑ\8bй паÑ\80олÑ\8c"
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#, fuzzy, php-format
+msgid "Please choose a valid zone name."
+msgstr "Ð\9fожалÑ\83йÑ\81Ñ\82а, Ñ\83кажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\83Ñ\8e кадÑ\80овÑ\83Ñ\8e Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\8e."
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-#, fuzzy
-msgid "Frequence"
-msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#, fuzzy, php-format
+msgid "Please choose a valid reverse zone name."
+msgstr "Ð\9fожалÑ\83йÑ\81Ñ\82а, Ñ\83кажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\83Ñ\8e кадÑ\80овÑ\83Ñ\8e Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\8e."
 
-#: plugins/admin/systems/glpi_devices.tpl:649
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
+msgid "Primary dns server must end with '.' to be a valid entry."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
+msgid "Your specified mail address must end with '.' to be a valid record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:375
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
+msgid "Only lowercase strings are allowed as zone name."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
 #, fuzzy
-msgid "Default frequence"
-msgstr "Ð\9fо Ñ\83молÑ\87аниÑ\8e"
+msgid "Please specify a numeric value for serial number."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/systems/glpi_devices.tpl:661
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
 #, fuzzy
-msgid "Add/Edit motherboard"
-msgstr "Ð\9aлавиаÑ\82Ñ\83Ñ\80а"
+msgid "Please specify a numeric value for refresh."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/systems/glpi_devices.tpl:696
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
 #, fuzzy
-msgid "Chipset"
-msgstr "сброс"
+msgid "Please specify a numeric value for ttl."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/glpi_devices.tpl:707
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
 #, fuzzy
-msgid "Add/Edit computer case"
-msgstr "не полнÑ\8bй"
+msgid "Please specify a numeric value for expire."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/systems/glpi_devices.tpl:742
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
 #, fuzzy
-msgid "format"
-msgstr "Ð\9fоÑ\80Ñ\82"
+msgid "Please specify a numeric value for retry."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#: plugins/admin/systems/class_servDNSeditZone.inc:409
+#: plugins/admin/systems/class_termDNS.inc:365
 #, php-format
-msgid "Internal Error can't create device of type '%s'"
+msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, fuzzy, php-format
-msgid "You're about to delete the glpi device '%s'."
-msgstr "Вы собираетесь удалить группу \"%s\"."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
+#: plugins/admin/systems/class_servKolab.inc:107
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#: plugins/admin/systems/class_servKolab.inc:113
 #, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#: plugins/admin/systems/class_servKolab.inc:128
 #, fuzzy
-msgid "devices"
-msgstr "Устройства"
+msgid "Remove Kolab extension"
+msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#: plugins/admin/systems/class_servKolab.inc:128
 #, fuzzy
-msgid "New mainbord"
-msgstr "Новый пароль"
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#: plugins/admin/systems/class_servKolab.inc:131
 #, fuzzy
-msgid "New processor"
-msgstr "Ð\9dовÑ\8bй паÑ\80олÑ\8c"
+msgid "Add Kolab service"
+msgstr "Ð\94обавиÑ\82Ñ\8c Ñ\81еÑ\80виÑ\81 DNS"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#: plugins/admin/systems/class_servKolab.inc:131
 #, fuzzy
-msgid "New case"
-msgstr "пользователи"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#: plugins/admin/systems/class_servKolab.inc:212
 #, fuzzy
-msgid "New network interface"
-msgstr "СеÑ\82евой пÑ\80инÑ\82еÑ\80"
+msgid "Removing kolab host entry failed"
+msgstr "Ð\9fоказаÑ\82Ñ\8c обÑ\8aекÑ\82Ñ\8b адÑ\80еÑ\81ной книги"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#: plugins/admin/systems/class_servKolab.inc:228
 #, fuzzy
-msgid "NI"
-msgstr "Unix"
+msgid "Removing server from kolab object failed"
+msgstr "Удалить телефонный аккаунт"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-#, fuzzy
-msgid "New ram"
-msgstr "пользователи"
+#: plugins/admin/systems/class_servKolab.inc:267
+msgid "Future days in Free/Busy settings must be set."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
+#: plugins/admin/systems/class_servKolab.inc:269
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-#, fuzzy
-msgid "New hard disk"
-msgstr "Сервер"
+#: plugins/admin/systems/class_servKolab.inc:273
+msgid "The given Quota settings value must be a number."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
+#: plugins/admin/systems/class_servKolab.inc:275
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
-msgid "New drive"
-msgstr "Сервер"
+#: plugins/admin/systems/class_servKolab.inc:277
+msgid "Future days must be a value."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
-msgid "D"
-msgstr "UID"
+#: plugins/admin/systems/class_servKolab.inc:281
+msgid "No SMTP privileged networks set."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#: plugins/admin/systems/class_servKolab.inc:364
 #, fuzzy
-msgid "New controller"
-msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
+msgid "Saving server to kolab object failed"
+msgstr "Ð\9cоÑ\8f Ñ\83Ñ\87еÑ\82наÑ\8f запиÑ\81Ñ\8c"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:10
+#, fuzzy
+msgid "Kerberos Realm"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#, fuzzy
+msgid "Admin user"
+msgstr "Пользователи домена"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:26
+#, fuzzy
+msgid "FAX database"
+msgstr "Базы данных"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+#: plugins/admin/systems/servdb.tpl:30
 #, fuzzy
-msgid "New sound card"
-msgstr "Ð\9dовÑ\8bй паÑ\80олÑ\8c"
+msgid "FAX DB user"
+msgstr "Ð\9fоказаÑ\82Ñ\8c полÑ\8cзоваÑ\82елей Ñ\84акÑ\81ов"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:42
+#, fuzzy
+msgid "Asterisk management"
+msgstr "Управление системами"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-#, fuzzy
-msgid "New misc device"
-msgstr "Сетевые устройства"
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
+#: plugins/admin/systems/servdb.tpl:74
 #, fuzzy
-msgid "You have to specify a valid name for this device."
-msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+msgid "Server identifier"
+msgstr "Ð\9dомеÑ\80 дома"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
+#: plugins/admin/systems/servdb.tpl:78
 #, fuzzy
-msgid "This device name is already in use."
-msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
+msgid "Connect URL"
+msgstr "Ð\9fодклÑ\8eÑ\87ение"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
+#: plugins/admin/systems/servdb.tpl:91
 #, fuzzy
-msgid "Other"
-msgstr "ФилÑ\8cÑ\82Ñ\80Ñ\8b"
+msgid "Sieve port"
+msgstr "СеÑ\80веÑ\80"
 
-#: plugins/admin/systems/class_terminalStartup.inc:364
+#: plugins/admin/systems/servdb.tpl:100
 #, fuzzy
-msgid "Saving terminal startup settings failed"
-msgstr "Ð\9fоÑ\87Ñ\82овÑ\8bе наÑ\81Ñ\82Ñ\80ойки пользователя"
+msgid "Logging database"
+msgstr "база пользователя"
 
-#: plugins/admin/systems/class_servService.inc:320
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:379
+#: plugins/admin/systems/servdb.tpl:119
 #, fuzzy
-msgid "Saving server service object failed"
-msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82Ñ\8b UNIX"
+msgid "Glpi database"
+msgstr "Ð\91азÑ\8b даннÑ\8bÑ\85"
 
-#: plugins/admin/systems/class_servService.inc:410
+#: plugins/admin/systems/servdb.tpl:133
 #, fuzzy
-msgid "Creating mount container failed"
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
+msgid "Database"
+msgstr "Ð\91азÑ\8b даннÑ\8bÑ\85"
 
-#: plugins/admin/systems/class_servService.inc:424
-#, fuzzy
-msgid "Removing mount container failed"
-msgstr "Удалить настройки эл. почты"
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Удаленная рабочая станция"
 
-#: plugins/admin/systems/class_servService.inc:436
-#, fuzzy
-msgid "Saving mount container failed"
-msgstr "Удалить настройки эл. почты"
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Способ подключения"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:8
-#, fuzzy
-msgid "Parent server"
-msgstr "Служба печати"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Выберите способ подключения к серверу терминалов"
+
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Терминал-сервер"
+
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Выберите сервер терминалов"
+
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Сервер шрифтов"
+
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Выберите сервер шрифтов"
+
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Устройство печати"
+
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr "Выберите, чтобы запустить на терминале службу печати по протоколу IPP"
+
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr "Предоставлять службу печати"
+
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Сервер для хранения запросов и временных файлов"
+
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr "Выберите файловую систему NFS для хранения временных файлов"
+
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Выберите драйвер для используемого сканера"
 
 #: plugins/admin/systems/servservice.tpl:37
 #, fuzzy
@@ -10097,125 +10027,185 @@ msgstr "Служба печати"
 msgid "Mail server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr ""
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+#, fuzzy
+msgid "This 'dn' has no network features."
+msgstr "Этот DN не имеет свойств принтера."
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
-msgstr ""
+#: plugins/admin/systems/class_componentGeneric.inc:101
+#, fuzzy
+msgid "Removing generic component failed"
+msgstr "Показать подразделения"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
-msgstr ""
+#: plugins/admin/systems/class_componentGeneric.inc:139
+#, fuzzy
+msgid "The required field 'Component name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+#: plugins/admin/systems/class_componentGeneric.inc:144
+#: plugins/admin/systems/class_phoneGeneric.inc:284
 #, fuzzy
-msgid "Display cartridge types matching"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81овпадениÑ\8f номеÑ\80ов"
+msgid "The required field IP address is empty."
+msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eÑ\81новной адÑ\80еÑ\81\" не заполнено."
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+#: plugins/admin/systems/class_componentGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:287
 #, fuzzy
-msgid "Regular expression for matching cartridge types"
-msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение длÑ\8f поиÑ\81ка адÑ\80еÑ\81а"
+msgid "The field IP address contains an invalid address."
+msgstr "Ð\97наÑ\87ение полÑ\8f \"Ð\98мÑ\8f\" Ñ\81одеÑ\80жиÑ\82 недопÑ\83Ñ\81Ñ\82имÑ\8bе Ñ\81имволÑ\8b."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:89
-msgid "text"
-msgstr "текст"
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:164
+#, fuzzy
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-msgid "graphic"
-msgstr "графика"
+#: plugins/admin/systems/class_componentGeneric.inc:223
+#, fuzzy
+msgid "Saving generic component failed"
+msgstr "Показать подразделения"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:128
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "Определение WAKECMD в вашем файле gosa.conf не найдено"
+#: plugins/admin/systems/class_printGeneric.inc:103
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:140
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr "Определение REBOOTCMD в вашем файле gosa.conf не найдено"
+#: plugins/admin/systems/class_printGeneric.inc:234
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:247
+#: plugins/admin/systems/class_printGeneric.inc:286
+#: plugins/admin/systems/class_printGeneric.inc:302
+#: plugins/admin/systems/class_printGeneric.inc:305
+msgid "Add printer extension"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:152
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
+#: plugins/admin/systems/class_printGeneric.inc:235
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construction."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-#, fuzzy
-msgid "Removing terminal failed"
-msgstr "Показать подразделения"
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:335
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr "У вас недостаточно прав для создания терминала в этой ветке."
+#: plugins/admin/systems/class_printGeneric.inc:248
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:339
-msgid "The required field 'Terminal name' is not set."
-msgstr "Обязательное поле 'Название терминала' не заполнено."
+#: plugins/admin/systems/class_printGeneric.inc:279
+msgid "This 'dn' has no printer features."
+msgstr "Этот DN не имеет свойств принтера."
+
+#: plugins/admin/systems/class_printGeneric.inc:287
+#, fuzzy
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_printGeneric.inc:294
+#: plugins/admin/systems/class_printGeneric.inc:297
+#, fuzzy
+msgid "Remove printer extension"
+msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:436
+#: plugins/admin/systems/class_printGeneric.inc:295
 #, fuzzy
-msgid "Saving terminal failed"
-msgstr "Показать подразделения"
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_servGeneric.inc:61
+#: plugins/admin/systems/class_printGeneric.inc:298
 #, fuzzy
-msgid "This 'dn' has no server features."
-msgstr "Этот DN не имеет свойств принтера."
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_printGeneric.inc:303
 #, fuzzy
-msgid "Removing server failed"
-msgstr "Удалить сервис DNS"
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_servGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:306
 #, fuzzy
-msgid "The required field 'Server name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_printGeneric.inc:480
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:488
 #, fuzzy
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f полÑ\8cзоваÑ\82елÑ\8f в Ñ\8dÑ\82ой веÑ\82ке."
+msgid "can't get ppd informations."
+msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
 
-#: plugins/admin/systems/class_servGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:501
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:503
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:554
 #, fuzzy
-msgid "Saving server failed"
+msgid "Removing printer failed"
 msgstr "Показать подразделения"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
+#: plugins/admin/systems/class_printGeneric.inc:731
 #, fuzzy
-msgid "Printer driver"
-msgstr "УÑ\81Ñ\82Ñ\80ойÑ\81Ñ\82во пеÑ\87аÑ\82и"
+msgid "Saving printer failed"
+msgstr "Ð\9fоказаÑ\82Ñ\8c подÑ\80азделениÑ\8f"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#, fuzzy
-msgid "Select"
-msgstr "Удалить"
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr ""
+"Выберите, должен ли терминал подерживать загрузку в графическом режиме с "
+"показом индикатора состояния"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-#, fuzzy
-msgid "New driver"
-msgstr "Сервер"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Загружать в графическом режиме"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-#, fuzzy
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Выберите, должен ли терминал загружаться в текстовом режиме"
+
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Загружать в стандартном текстовом режиме"
+
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
-"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
-"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
-"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
+"Выберите, нужно ли использовать подробный вывод информации при загрузке"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Ð\9dазвание"
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "Ð\98Ñ\81полÑ\8cзÑ\83йÑ\82е оÑ\82ладоÑ\87нÑ\8bй Ñ\80ежим"
 
 #: plugins/admin/systems/servkolab.tpl:9
 #, fuzzy
@@ -10256,685 +10246,517 @@ msgstr "Служба SSH"
 msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:89
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:100
-#, fuzzy
-msgid "Quota settings"
-msgstr "Настройки Samba"
-
-#: plugins/admin/systems/servkolab.tpl:116
-#, fuzzy
-msgid "Free/Busy settings"
-msgstr "Настройки факса"
-
-#: plugins/admin/systems/servkolab.tpl:121
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:136
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:141
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enter multiple values, seperated with"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:157
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Enable MX lookup for relayhost"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:168
-msgid "Host used to relay mails"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:182
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:188
-msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:6
-#, fuzzy
-msgid "General"
-msgstr "Общее"
-
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Имя принтера"
-
-#: plugins/admin/systems/printer.tpl:36
-msgid "Details"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:39
-#, fuzzy
-msgid "Printer location"
-msgstr "Настройки телефона"
-
-#: plugins/admin/systems/printer.tpl:43
-msgid "Printer URL"
-msgstr "URL принтера"
-
-#: plugins/admin/systems/printer.tpl:63
-#, fuzzy
-msgid "Permissions"
-msgstr "Права для членов группы"
-
-#: plugins/admin/systems/printer.tpl:70
-#, fuzzy
-msgid "Users which are allowed to use this printer"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
-
-#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
-#, fuzzy
-msgid "Add user"
-msgstr "Пользователи домена"
-
-#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
-#, fuzzy
-msgid "Add group"
-msgstr "группы"
-
-#: plugins/admin/systems/printer.tpl:86
-#, fuzzy
-msgid "Users which are allowed to administrate this printer"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
-
-#: plugins/admin/systems/printer.tpl:87
-#, fuzzy
-msgid "Admins"
-msgstr "DN администратора"
-
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Удалить сервис DHCP"
-
-#: plugins/admin/systems/class_servDHCP.inc:37
-#, fuzzy
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "Добавить сервис DHCP"
-
-#: plugins/admin/systems/class_servDHCP.inc:40
-#, fuzzy
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-#, fuzzy
-msgid "Reference"
-msgstr "Ссылки"
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:78
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
-#, fuzzy
-msgid "New entry"
-msgstr "пользователи"
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:173
-#, php-format
-msgid ""
-"Can't rename '%s' to '%s' there is already an entry with the same name in "
-"our zone editing dialog."
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:200
-#, fuzzy, php-format
-msgid "Entry name '%s' contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
+#: plugins/admin/systems/servkolab.tpl:89
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:209
-#, fuzzy, php-format
-msgid "Can not rename '%s' to '%s',the destination name already exists."
-msgstr "Ð\9fодÑ\80азделение Ñ\81 Ñ\82аким именем Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
+#: plugins/admin/systems/servkolab.tpl:100
+#, fuzzy
+msgid "Quota settings"
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Samba"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
-#, fuzzy, php-format
-msgid "Can not create '%s',the destination name already exists."
-msgstr "Ð\9fодÑ\80азделение Ñ\81 Ñ\82аким именем Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
+#: plugins/admin/systems/servkolab.tpl:116
+#, fuzzy
+msgid "Free/Busy settings"
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Ñ\84акÑ\81а"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:224
-#, php-format
-msgid "The name '%s' is used more than once."
+#: plugins/admin/systems/servkolab.tpl:121
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
+#: plugins/admin/systems/servkolab.tpl:136
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:247
-#, php-format
-msgid "The record type '%s' is a unique type and can't be defined twice."
+#: plugins/admin/systems/servkolab.tpl:141
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:254
-#, fuzzy, php-format
-msgid "There is an empty '%s' for host '%s'."
-msgstr "Метод '%s' не описан в вашем файле конфигурации."
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enter multiple values, seperated with"
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:262
-#, php-format
-msgid "There is a duplicate entry in '%s' for '%s'."
+#: plugins/admin/systems/servkolab.tpl:157
+msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Системы"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Enable MX lookup for relayhost"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:211
-msgid "You can't edit this object type yet!"
-msgstr "Вы не можете редактировать сейчас этот тип объекта!"
+#: plugins/admin/systems/servkolab.tpl:168
+msgid "Host used to relay mails"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:236
-msgid "Passwords entered as new and repeated do not match!"
-msgstr "Введенные пароли не совпадают!"
+#: plugins/admin/systems/servkolab.tpl:182
+msgid "Accept Internet Mail"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:253
-msgid "You are not allowed to set this systems password!"
-msgstr "У вас недостаточно прав для смены пароля этой системы!"
+#: plugins/admin/systems/servkolab.tpl:188
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:307
-#, fuzzy, php-format
-msgid "You're about to delete all information about the component at '%s'."
-msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
+#: plugins/admin/systems/SelectDeviceType.tpl:3
+msgid ""
+"This is a new system which currently has no system type defined. Please "
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:616
-msgid "New terminal"
-msgstr "Создать терминал"
+#: plugins/admin/systems/SelectDeviceType.tpl:9
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:618
-msgid "New workstation"
-msgstr "Новая рабочая станция"
+#: plugins/admin/systems/SelectDeviceType.tpl:21
+#, fuzzy
+msgid "Choose a system type"
+msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/SelectDeviceType.tpl:32
 #, fuzzy
-msgid "New Device"
-msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
+msgid "Choose an object group as template"
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
+#: plugins/admin/systems/SelectDeviceType.tpl:33
 #, fuzzy
-msgid "Terminal template for"
-msgstr "Шаблон Ñ\82еÑ\80минала"
+msgid "Choose an object group"
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/systems/class_systemManagement.inc:647
-msgid "Workstation template for"
-msgstr "Шаблон рабочей станции для"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:735
-#, fuzzy
-msgid "New System from incoming"
-msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, fuzzy, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "Ð\92Ñ\8b Ñ\81обиÑ\80аеÑ\82еÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c пÑ\80иложение \"%s\"."
 
-#: plugins/admin/systems/class_systemManagement.inc:737
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#, fuzzy
-msgid "Terminal"
-msgstr "Терминалы"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:738
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Рабочая станция"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Workstation is installing"
-msgstr "Ð\98мÑ\8f Ñ\80абоÑ\87ий Ñ\81Ñ\82анÑ\86ии"
+msgid "New monitor"
+msgstr "Ð\9dовÑ\8bй паÑ\80олÑ\8c"
 
-#: plugins/admin/systems/class_systemManagement.inc:740
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Workstation is waiting for action"
-msgstr "Шаблон Ñ\80абоÑ\87ей Ñ\81Ñ\82анÑ\86ии длÑ\8f"
+msgid "M"
+msgstr "Ð\9cб"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
+#: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
-msgid "Workstation installation failed"
-msgstr "Шаблон Ñ\80абоÑ\87ей Ñ\81Ñ\82анÑ\86ии"
+msgid "Choose a base"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
-msgid "Server is installing"
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:745
-#, fuzzy
-msgid "Server is waiting for action"
-msgstr "Общая информация о пользователе"
-
-#: plugins/admin/systems/class_systemManagement.inc:746
-#, fuzzy
-msgid "Server installation failed"
-msgstr "Номер дома"
-
-#: plugins/admin/systems/class_systemManagement.inc:747
-#, fuzzy
-msgid "Winstation"
-msgstr "Рабочая станция"
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
+msgid "Filter entries with this syntax"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:748
-#, fuzzy
-msgid "Network Device"
-msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "УдалиÑ\82Ñ\8c"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
+#: plugins/admin/systems/class_glpiAccount.inc:178
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
-msgid ""
-"Be careful editing record types with this dialog. All changes will be saved "
-"immediately when using the save button."
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
 msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
+"You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#: plugins/admin/systems/class_glpiAccount.inc:323
 #, fuzzy
-msgid "Create a new DNS zone entry"
-msgstr "Создание нового обÑ\8aекÑ\82а в"
+msgid "Rename failed, this system type name is already used."
+msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#: plugins/admin/systems/class_glpiAccount.inc:379
 #, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "РедакÑ\82иоваÑ\82Ñ\8c обÑ\8aекÑ\82"
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr "Ð\93Ñ\80Ñ\83ппа Ñ\81 Ñ\82аким именем Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-#, fuzzy
-msgid "Website"
-msgstr "запись"
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:138
-#: plugins/admin/ogroups/class_phonequeue.inc:691
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/systems/class_glpiAccount.inc:413
 #, fuzzy
-msgid "Phone number"
-msgstr "Телефонные номера"
-
-#: plugins/admin/systems/class_servDNS.inc:67
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr "Удалить сервис DNS"
-
-#: plugins/admin/systems/class_servDNS.inc:68
-#: plugins/admin/systems/class_inventory.inc:37
+msgid "Updating operating system failed, specifed name is already used."
+msgstr "Группа с таким именем уже существует."
+
+#: plugins/admin/systems/class_glpiAccount.inc:566
 #, fuzzy
 msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servDNS.inc:70
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
-msgstr "Добавить сервис DNS"
-
-#: plugins/admin/systems/class_servDNS.inc:71
-#: plugins/admin/systems/class_inventory.inc:40
+#: plugins/admin/systems/class_glpiAccount.inc:569
 #, fuzzy
 msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servDNS.inc:159
-#, fuzzy
-msgid "Reverse zone"
-msgstr "Ссылки"
-
-#: plugins/admin/systems/class_servDNS.inc:223
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:261
+#: plugins/admin/systems/class_glpiAccount.inc:667
 #, fuzzy
-msgid "Removing DNS service failed"
-msgstr "УдалиÑ\82Ñ\8c Ñ\81еÑ\80виÑ\81 DNS"
+msgid "Can't remove glpi account, while mysql extension is missing."
+msgstr "Ð\9dе Ñ\83даеÑ\82Ñ\81Ñ\8f подклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f к базе жÑ\83Ñ\80налов, оÑ\82Ñ\87еÑ\82Ñ\8b показанÑ\8b не бÑ\83дÑ\83Ñ\82!"
 
-#: plugins/admin/systems/class_servDNS.inc:282
+#: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
-msgid "Updating DNS service failed"
-msgstr "УдалиÑ\82Ñ\8c Ñ\81еÑ\80виÑ\81 DNS"
+msgid "Advanced phone settings"
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Ñ\82елеÑ\84она"
 
-#: plugins/admin/systems/class_servDNS.inc:291
+#: plugins/admin/systems/phonesettings.tpl:6
 #, fuzzy
-msgid "Removing DNS entries failed"
-msgstr "УдалиÑ\82Ñ\8c Ñ\81еÑ\80виÑ\81 DNS"
+msgid "Phone type"
+msgstr "Ð\9dазвание"
 
-#: plugins/admin/systems/class_servDNS.inc:312
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
 #, fuzzy
-msgid "Saving DNS entries failed"
-msgstr "UNIX аккаунт"
+msgid "Choose a phone type"
+msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
-#, fuzzy
-msgid "Kerberos Realm"
-msgstr "Kerberos"
-
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/phonesettings.tpl:32
 #, fuzzy
-msgid "Admin user"
-msgstr "Ð\9fолÑ\8cзоваÑ\82ели домена"
+msgid "DTMF mode"
+msgstr "Режим"
 
-#: plugins/admin/systems/servdb.tpl:26
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
 #, fuzzy
-msgid "FAX database"
-msgstr "Ð\91азÑ\8b даннÑ\8bÑ\85"
+msgid "Default IP"
+msgstr "по Ñ\83молÑ\87аниÑ\8e"
 
-#: plugins/admin/systems/servdb.tpl:30
-#, fuzzy
-msgid "FAX DB user"
-msgstr "Показать пользователей факсов"
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/phonesettings.tpl:75
 #, fuzzy
-msgid "Asterisk management"
-msgstr "УпÑ\80авление Ñ\81иÑ\81Ñ\82емами"
+msgid "Modus"
+msgstr "Ð\9cÑ\8bÑ\88Ñ\8c"
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr ""
+#: plugins/admin/systems/phonesettings.tpl:116
+#, fuzzy
+msgid "Secret"
+msgstr "Улица"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/phonesettings.tpl:145
 #, fuzzy
-msgid "Server identifier"
-msgstr "Ð\9dомеÑ\80 дома"
+msgid "Account code"
+msgstr "УÑ\87еÑ\82наÑ\8f запиÑ\81Ñ\8c"
 
-#: plugins/admin/systems/servdb.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:153
 #, fuzzy
-msgid "Connect URL"
-msgstr "Ð\9fодклÑ\8eÑ\87ение"
+msgid "Trunk lines"
+msgstr "Тонкие клиенÑ\82Ñ\8b"
 
-#: plugins/admin/systems/servdb.tpl:91
-#, fuzzy
-msgid "Sieve port"
-msgstr "Сервер"
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:100
+#: plugins/admin/systems/phonesettings.tpl:183
 #, fuzzy
-msgid "Logging database"
-msgstr "база полÑ\8cзоваÑ\82елÑ\8f"
+msgid "Hosts that are not allowed to connect"
+msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\83далениÑ\8f Ñ\8dÑ\82ого обÑ\8aекÑ\82а!"
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:119
+#: plugins/admin/systems/wingeneric.tpl:6
 #, fuzzy
-msgid "Glpi database"
-msgstr "Ð\91азÑ\8b даннÑ\8bÑ\85"
+msgid "Machine name"
+msgstr "Ð\9dазвание"
 
-#: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/glpiManufacturer.tpl:1
 #, fuzzy
-msgid "Database"
-msgstr "Ð\91азÑ\8b даннÑ\8bÑ\85"
+msgid "Manage manufacturers"
+msgstr "РедакÑ\82иоваÑ\82Ñ\8c обÑ\8aекÑ\82"
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
-"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
-"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
-"результаты этой операции."
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+#, fuzzy
+msgid "Attachment"
+msgstr "подразделения"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:351
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
 #, fuzzy
-msgid "This zoneName is already in use"
-msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
+msgid "Filename"
+msgstr "Ð\98мÑ\8f Ñ\81еÑ\80веÑ\80а"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:354
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
 #, fuzzy
-msgid "This reverse zone is already in use"
-msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
+msgid "Mime-type"
+msgstr "Тип"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#: plugins/admin/systems/class_termDNS.inc:132
 #, fuzzy, php-format
-msgid "Please choose a valid zone name."
-msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
+msgid ""
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:363
-#, fuzzy, php-format
-msgid "Please choose a valid reverse zone name."
-msgstr "Ð\9fожалÑ\83йÑ\81Ñ\82а, Ñ\83кажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\83Ñ\8e кадÑ\80овÑ\83Ñ\8e Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\8e."
+#: plugins/admin/systems/class_termDNS.inc:298
+#, fuzzy
+msgid "The required field 'IP-address' is not set."
+msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eÑ\81новной адÑ\80еÑ\81\" не заполнено."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:367
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/class_termDNS.inc:305
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:371
-msgid "Your specified mail address must end with '.' to be a valid record."
-msgstr ""
+#: plugins/admin/systems/class_termDNS.inc:312
+#, fuzzy
+msgid "The required field 'MAC-address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:375
-#: plugins/admin/systems/class_servDNSeditZone.inc:379
+#: plugins/admin/systems/class_termDNS.inc:319
 msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
+"':'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:383
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/class_termDNS.inc:339
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:387
-#, fuzzy
-msgid "Please specify a numeric value for serial number."
-msgstr "Укажите корректный номер телефона."
+#: plugins/admin/systems/class_termDNS.inc:347
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:391
-#, fuzzy
-msgid "Please specify a numeric value for refresh."
-msgstr "Укажите корректный номер телефона."
+#: plugins/admin/systems/class_termDNS.inc:358
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:395
+#: plugins/admin/systems/class_termDNS.inc:448
 #, fuzzy
-msgid "Please specify a numeric value for ttl."
-msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+msgid "Saving terminal to DNS object failed"
+msgstr "СпиÑ\81ок подÑ\80азделений"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:399
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
 #, fuzzy
-msgid "Please specify a numeric value for expire."
-msgstr "Укажите корректный номер телефона."
+msgid "The selected name is already in use."
+msgstr "Указанное имя уже используется."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, fuzzy, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
+msgstr "Вы собираетесь удалить приложение \"%s\"."
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:403
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
 #, fuzzy
-msgid "Please specify a numeric value for retry."
-msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+msgid "There is no valid file uploaded."
+msgstr "Файл небÑ\8bл загÑ\80Ñ\83жен"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:23
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
 #, fuzzy
-msgid "Choose a base"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
+msgid "Upload wasn't successfull."
+msgstr "ЭкÑ\81поÑ\80Ñ\82 Ñ\83Ñ\81пеÑ\88ен."
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:34
-msgid ""
-"Step in the prefered tree and click save to use the current subtree as base. "
-"Or click the image at the end of each entry."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:51
-msgid "Filter entries with this syntax"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+#, fuzzy
+msgid "There is already a file with the same name uploaded."
 msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:115
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
 #, fuzzy, php-format
-msgid "Select this base"
+msgid "Can't create file '%s'."
 msgstr "Удалить"
 
-#: plugins/admin/systems/class_printGeneric.inc:103
-#, php-format
-msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:234
-#: plugins/admin/systems/class_printGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:247
-#: plugins/admin/systems/class_printGeneric.inc:286
-#: plugins/admin/systems/class_printGeneric.inc:302
-#: plugins/admin/systems/class_printGeneric.inc:305
-msgid "Add printer extension"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:235
-msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construction."
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+#, fuzzy
+msgid "Currently no file uploaded."
+msgstr "Файл небыл загружен"
 
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+#, fuzzy
+msgid "Mime"
+msgstr "Мобильный"
 
-#: plugins/admin/systems/class_printGeneric.inc:248
-msgid "This is a terminal template, printer tab is disabled."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:279
-msgid "This 'dn' has no printer features."
-msgstr "Этот DN не имеет свойств принтера."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+#, fuzzy
+msgid "empty"
+msgstr "Шаблон"
 
-#: plugins/admin/systems/class_printGeneric.inc:287
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
 #, fuzzy
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Create new attachment"
+msgstr "Подразделение"
 
-#: plugins/admin/systems/class_printGeneric.inc:294
-#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
 #, fuzzy
-msgid "Remove printer extension"
+msgid "New Attachment"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
+#, fuzzy
+msgid "Please specify a valid name for this attachment."
+msgstr "Укажите корректный номер телефона."
+
+#: plugins/admin/systems/class_servRepository.inc:97
+#, fuzzy
+msgid "Remove FAI repository extension."
 msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_servRepository.inc:98
 #, fuzzy
 msgid ""
-"This workstation has printer extension enabled.You can disable it by "
+"This server has FAI repository features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:298
-#, fuzzy
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
 msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_servRepository.inc:101
 #, fuzzy
 msgid ""
-"This workstation has printer extension disabled. You can enable it by "
+"This server has FAI repository features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:306
-#, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
-
-#: plugins/admin/systems/class_printGeneric.inc:480
+#: plugins/admin/systems/class_servRepository.inc:144
 #, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, fuzzy
-msgid "can't get ppd informations."
-msgstr "Системная информация"
-
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_servRepository.inc:176
 #, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:503
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
+"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
+"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
+"результаты этой операции."
 
-#: plugins/admin/systems/class_printGeneric.inc:554
+#: plugins/admin/systems/servRepository.tpl:6
 #, fuzzy
-msgid "Removing printer failed"
-msgstr "Ð\9fоказаÑ\82Ñ\8c подÑ\80азделениÑ\8f"
+msgid "List of configured repositories."
+msgstr "СпиÑ\81ок гÑ\80Ñ\83пп"
 
-#: plugins/admin/systems/class_printGeneric.inc:731
+#: plugins/admin/systems/servRepository.tpl:11
 #, fuzzy
-msgid "Saving printer failed"
-msgstr "Показать подразделения"
+msgid "Add repository"
+msgstr "Повторить"
+
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
 
 #: plugins/admin/systems/glpiAttachmentPool.tpl:6
 #, fuzzy
@@ -10957,96 +10779,102 @@ msgstr "Шаблон для подразделений"
 msgid "Regular expression for matching attachment names"
 msgstr "Регулярное выражение, соответствующее именам подразделений"
 
-#: plugins/admin/systems/phonesettings.tpl:1
+#: plugins/admin/systems/servdnseditzone.tpl:7
 #, fuzzy
-msgid "Advanced phone settings"
-msgstr "Настройки телефона"
+msgid "Zone name"
+msgstr "Название"
 
-#: plugins/admin/systems/phonesettings.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:13
 #, fuzzy
-msgid "Phone type"
-msgstr "Ð\9dазвание"
+msgid "Network address"
+msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
+#: plugins/admin/systems/servdnseditzone.tpl:24
 #, fuzzy
-msgid "Choose a phone type"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
+msgid "Zone records"
+msgstr "Ð\9aаÑ\82алог"
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
+#: plugins/admin/systems/servdnseditzone.tpl:27
+msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
+#: plugins/admin/systems/servdnseditzone.tpl:39
 #, fuzzy
-msgid "DTMF mode"
-msgstr "Режим"
+msgid "SOA record"
+msgstr "Ð\9aаÑ\82алог"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
+#: plugins/admin/systems/servdnseditzone.tpl:45
 #, fuzzy
-msgid "Default IP"
-msgstr "по Ñ\83молÑ\87аниÑ\8e"
+msgid "Primary dns server for this zone"
+msgstr "Ð\9eÑ\81новной адÑ\80еÑ\81 Ñ\8dл. поÑ\87Ñ\82Ñ\8b длÑ\8f Ñ\8dÑ\82ой обÑ\89ей папки"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
+#: plugins/admin/systems/servdnseditzone.tpl:57
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Повторить"
+
+#: plugins/admin/systems/servdnseditzone.tpl:79
 #, fuzzy
-msgid "Modus"
-msgstr "Ð\9cÑ\8bÑ\88Ñ\8c"
+msgid "Expire"
+msgstr "ЭкÑ\81поÑ\80Ñ\82"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:100
+#, fuzzy
+msgid "MxRecords"
+msgstr "Каталог"
 
-#: plugins/admin/systems/phonesettings.tpl:116
+#: plugins/admin/systems/servdnseditzone.tpl:112
 #, fuzzy
-msgid "Secret"
-msgstr "УлиÑ\86а"
+msgid "Global zone records"
+msgstr "Ð\9aаÑ\82алог"
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
-msgstr ""
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
+#, fuzzy
+msgid "Please enter a value for 'release'."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
-msgstr ""
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
+#, fuzzy
+msgid "Please specify a valid value for 'url'."
+msgstr "Укажите корректный номер телефона."
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, fuzzy, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: plugins/admin/systems/phonesettings.tpl:145
+#: plugins/admin/systems/class_winGeneric.inc:126
 #, fuzzy
-msgid "Account code"
-msgstr "Учетная запись"
+msgid "Removing Samba workstation failed"
+msgstr "Удалить учетную запись Samba"
 
-#: plugins/admin/systems/phonesettings.tpl:153
+#: plugins/admin/systems/class_winGeneric.inc:224
 #, fuzzy
-msgid "Trunk lines"
-msgstr "Тонкие клиенты"
-
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
-msgstr ""
+msgid "Saving Samba workstation failed"
+msgstr "Приложение"
 
-#: plugins/admin/systems/phonesettings.tpl:183
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
 #, fuzzy
-msgid "Hosts that are not allowed to connect"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
-
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
-msgstr ""
+msgid "use"
+msgstr "Мышь"
 
-#: plugins/admin/systems/wingeneric.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:10
 #, fuzzy
-msgid "Machine name"
-msgstr "Название"
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Лучше всего перед удалением сохранить резервную копию текущего дерева LDAP в "
+"файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
+"<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
 
 #: plugins/admin/systems/password.tpl:2
 #, fuzzy
@@ -11067,160 +10895,281 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr "Изменение пароля влияет только на аутентификацию в системе."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
-#, fuzzy, php-format
-msgid "You're about to delete the glpi attachment component '%s'."
-msgstr "Вы собираетесь удалить приложение \"%s\"."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
-#, php-format
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
 #, fuzzy
-msgid "There is no valid file uploaded."
-msgstr "Файл небÑ\8bл загÑ\80Ñ\83жен"
+msgid "Display cartridge types matching"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81овпадениÑ\8f номеÑ\80ов"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
 #, fuzzy
-msgid "Upload wasn't successfull."
-msgstr "ЭкÑ\81поÑ\80Ñ\82 Ñ\83Ñ\81пеÑ\88ен."
+msgid "Regular expression for matching cartridge types"
+msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение длÑ\8f поиÑ\81ка адÑ\80еÑ\81а"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Выберите тип системного компонента который желаете создать"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
 msgstr ""
+"Терминалы и рабочие станцие Linux были созданы автоматически. Поэтому вам "
+"необходимо только создать шаблоны для нужного подразделения. Сервера обычно "
+"добавляются тоже, но в отдельных случаях вам может понадобиться "
+"'виртуальный' сервер для описания обязательных сервисов. Прочие сетевые "
+"компоненты могут быть использованы при установке Nagios для создания "
+"межкомпонентных зависимостей."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Шаблон тонкого клиента Linux"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Шаблон рабочей станции Linux"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Сервер Linux"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Рабочая станция Windows"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Прочие сетевые компоненты"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Создать"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:89
+msgid "text"
+msgstr "текст"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+msgid "graphic"
+msgstr "графика"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:128
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "Определение WAKECMD в вашем файле gosa.conf не найдено"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:140
+msgid "No REBOOTCMD definition found in your gosa.conf"
+msgstr "Определение REBOOTCMD в вашем файле gosa.conf не найдено"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:152
+msgid "No HALTCMD definition found in your gosa.conf"
+msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:280
 #, fuzzy
-msgid "There is already a file with the same name uploaded."
+msgid "Removing terminal failed"
+msgstr "Показать подразделения"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:335
+msgid "You have no permissions to create a terminal on this 'Base'."
+msgstr "У вас недостаточно прав для создания терминала в этой ветке."
+
+#: plugins/admin/systems/class_terminalGeneric.inc:339
+msgid "The required field 'Terminal name' is not set."
+msgstr "Обязательное поле 'Название терминала' не заполнено."
+
+#: plugins/admin/systems/class_terminalGeneric.inc:436
+#, fuzzy
+msgid "Saving terminal failed"
+msgstr "Показать подразделения"
+
+#: plugins/admin/systems/class_servGeneric.inc:61
+#, fuzzy
+msgid "This 'dn' has no server features."
+msgstr "Этот DN не имеет свойств принтера."
+
+#: plugins/admin/systems/class_servGeneric.inc:148
+#, fuzzy
+msgid "Removing server failed"
+msgstr "Удалить сервис DNS"
+
+#: plugins/admin/systems/class_servGeneric.inc:184
+#, fuzzy
+msgid "The required field 'Server name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
+
+#: plugins/admin/systems/class_servGeneric.inc:191
+#, fuzzy
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/admin/systems/class_servGeneric.inc:260
+#, fuzzy
+msgid "Saving server failed"
+msgstr "Показать подразделения"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
 msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
 #, fuzzy, php-format
-msgid "Can't create file '%s'."
-msgstr "УдалиÑ\82Ñ\8c"
+msgid "You're about to delete the glpi device '%s'."
+msgstr "Ð\92Ñ\8b Ñ\81обиÑ\80аеÑ\82еÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c гÑ\80Ñ\83ппÑ\83 \"%s\"."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
 #, fuzzy
-msgid "Currently no file uploaded."
-msgstr "Файл небÑ\8bл загÑ\80Ñ\83жен"
+msgid "devices"
+msgstr "УÑ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 #, fuzzy
-msgid "Mime"
-msgstr "Ð\9cобилÑ\8cнÑ\8bй"
+msgid "New mainbord"
+msgstr "Ð\9dовÑ\8bй паÑ\80олÑ\8c"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#, fuzzy
+msgid "New processor"
+msgstr "Новый пароль"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#, fuzzy
+msgid "New case"
+msgstr "пользователи"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 #, fuzzy
-msgid "empty"
-msgstr "Шаблон"
+msgid "New network interface"
+msgstr "СеÑ\82евой пÑ\80инÑ\82еÑ\80"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 #, fuzzy
-msgid "Create new attachment"
-msgstr "Подразделение"
+msgid "NI"
+msgstr "Unix"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+#, fuzzy
+msgid "New ram"
+msgstr "пользователи"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+#, fuzzy
+msgid "New hard disk"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 #, fuzzy
-msgid "New Attachment"
-msgstr "подÑ\80азделениÑ\8f"
+msgid "New drive"
+msgstr "СеÑ\80веÑ\80"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 #, fuzzy
-msgid "Please specify a valid name for this attachment."
-msgstr "Укажите корректный номер телефона."
+msgid "D"
+msgstr "UID"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Выберите тип системного компонента который желаете создать"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#, fuzzy
+msgid "New controller"
+msgstr "Номер телефона"
 
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
 msgstr ""
-"Терминалы и рабочие станцие Linux были созданы автоматически. Поэтому вам "
-"необходимо только создать шаблоны для нужного подразделения. Сервера обычно "
-"добавляются тоже, но в отдельных случаях вам может понадобиться "
-"'виртуальный' сервер для описания обязательных сервисов. Прочие сетевые "
-"компоненты могут быть использованы при установке Nagios для создания "
-"межкомпонентных зависимостей."
-
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Шаблон тонкого клиента Linux"
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Шаблон рабочей станции Linux"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Сервер Linux"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Рабочая станция Windows"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+#, fuzzy
+msgid "New sound card"
+msgstr "Новый пароль"
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Сетевой принтер"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Прочие сетевые компоненты"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Создать"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:119
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
 #, fuzzy
-msgid "Please enter a value for 'release'."
-msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+msgid "New misc device"
+msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:123
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
 #, fuzzy
-msgid "Please specify a valid value for 'url'."
+msgid "You have to specify a valid name for this device."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
 #, fuzzy
-msgid "Please specify a name."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f!"
+msgid "This device name is already in use."
+msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 #, fuzzy
-msgid "Specified name is already in use, please choose another one."
-msgstr "Ð\93Ñ\80Ñ\83ппа Ñ\81 Ñ\82аким именем Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
+msgid "Other"
+msgstr "ФилÑ\8cÑ\82Ñ\80Ñ\8b"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:105
 msgid "This 'dn' has no phone features."
@@ -11277,15 +11226,67 @@ msgstr "У вас недостаточно прав для создания те
 msgid "Saving phone failed"
 msgstr "Приложение"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+#, fuzzy
+msgid "Printer driver"
+msgstr "Устройство печати"
+
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#, fuzzy
+msgid "Select"
+msgstr "Удалить"
+
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+#, fuzzy
+msgid "New driver"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
 #, php-format
-msgid "Selected vendor '%s' does not exists in our list of ppds."
+msgid ""
+"Can't rename '%s' to '%s' there is already an entry with the same name in "
+"our zone editing dialog."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
-#, fuzzy
-msgid "Printer ppd selection."
-msgstr "Настройки телефона"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#, fuzzy, php-format
+msgid "Entry name '%s' contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#, fuzzy, php-format
+msgid "Can not rename '%s' to '%s',the destination name already exists."
+msgstr "Подразделение с таким именем уже существует."
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#, fuzzy, php-format
+msgid "Can not create '%s',the destination name already exists."
+msgstr "Подразделение с таким именем уже существует."
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#, php-format
+msgid "The name '%s' is used more than once."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#, php-format
+msgid "The host name '%s' should be written in lowercase."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#, php-format
+msgid "The record type '%s' is a unique type and can't be defined twice."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#, fuzzy, php-format
+msgid "There is an empty '%s' for host '%s'."
+msgstr "Метод '%s' не описан в вашем файле конфигурации."
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#, php-format
+msgid "There is a duplicate entry in '%s' for '%s'."
+msgstr ""
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
 #, fuzzy
@@ -11297,43 +11298,149 @@ msgstr "Выбрать пользователей для добавления"
 msgid "Display members of department"
 msgstr "Показать номера из подразделения"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-#, fuzzy
-msgid "Display members matching"
-msgstr "Показать совпадения номеров"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+#, fuzzy
+msgid "Display members matching"
+msgstr "Показать совпадения номеров"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+#, fuzzy
+msgid "Regular expression for matching member names"
+msgstr "Регулярное выражение, соответствующее именам пользователей"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+#, fuzzy
+msgid "Please specify a name."
+msgstr "Введите корректное имя пользователя!"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+#, fuzzy
+msgid "Specified name is already in use, please choose another one."
+msgstr "Группа с таким именем уже существует."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#, php-format
+msgid "Selected vendor '%s' does not exists in our list of ppds."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#, fuzzy
+msgid "Printer ppd selection."
+msgstr "Настройки телефона"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:58
+#: plugins/admin/ogroups/tabs_ogroups.inc:161
+#, fuzzy
+msgid "Phone queue"
+msgstr "Номер телефона"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:84
+#, fuzzy
+msgid "System"
+msgstr "Системы"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:141
+msgid "Terminals"
+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_termgroup.inc:111
+msgid "There must be at least one NTP server selected."
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Select to see departments"
+msgstr "Выберите подразделение"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Show departments"
+msgstr "Показать подразделения"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Select to see GOsa accounts"
+msgstr "Выберите чтобы посмотреть пользователей GOsa"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Show people"
+msgstr "Показать людей"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Select to see GOsa groups"
+msgstr "Выберите чтобы посмотреть группы GOsa"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Show groups"
+msgstr "Показать группы"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Select to see applications"
+msgstr "Выберите чтобы посмотреть приложения"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Show applications"
+msgstr "Показать приложения"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-#, fuzzy
-msgid "Regular expression for matching member names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Select to see workstations"
+msgstr "Выберите чтобы посмотреть рабочие станции"
 
-#: plugins/admin/ogroups/class_termgroup.inc:111
-msgid "There must be at least one NTP server selected."
-msgstr ""
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Select to see terminals"
+msgstr "Выберите чтобы посмотреть терминалы"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:58
-#: plugins/admin/ogroups/tabs_ogroups.inc:157
-#, fuzzy
-msgid "Phone queue"
-msgstr "Номер телефона"
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
+msgid "Select to see printers"
+msgstr "Выберите чтобы посмотреть принтеры"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:83
-#, fuzzy
-msgid "System"
-msgstr "Системы"
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
+msgid "Show printers"
+msgstr "Показать принтеры"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Terminals"
-msgstr "ТеÑ\80миналы"
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Select to see phones"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\87Ñ\82обÑ\8b поÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\82елеÑ\84оны"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+msgid "Display objects of department"
+msgstr "Показать объекты подразделения"
+
+#: plugins/admin/ogroups/termgroup.tpl:2
+msgid ""
+"Actions you choose here influence all systems in this object group. "
+"Additionally, all values editable here can be inherited by the clients "
+"assigned to this object group."
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-#, fuzzy
-msgid "Primary mail address for this distribution list"
-msgstr "Основной адрес эл. почты для этой общей папки"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
+msgid "Object groups"
+msgstr "Объединения"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Вы собираетесь удалить групповой объект \"%s\"."
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:193
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+msgid "You are not allowed to delete this object group!"
+msgstr "У вас недостаточно прав для удаления этого группового объекта!"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
@@ -11450,69 +11557,6 @@ msgstr "Объект группы"
 msgid "Object group"
 msgstr "Объект группы"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
-msgstr "Выберите подразделение"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
-msgstr "Показать подразделения"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
-msgstr "Выберите чтобы посмотреть пользователей GOsa"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Show people"
-msgstr "Показать людей"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see GOsa groups"
-msgstr "Выберите чтобы посмотреть группы GOsa"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Show groups"
-msgstr "Показать группы"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Select to see applications"
-msgstr "Выберите чтобы посмотреть приложения"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Show applications"
-msgstr "Показать приложения"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
-msgstr "Выберите чтобы посмотреть рабочие станции"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Select to see terminals"
-msgstr "Выберите чтобы посмотреть терминалы"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Select to see printers"
-msgstr "Выберите чтобы посмотреть принтеры"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Show printers"
-msgstr "Показать принтеры"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Select to see phones"
-msgstr "Выберите чтобы посмотреть телефоны"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
-msgstr "Показать объекты подразделения"
-
-#: plugins/admin/ogroups/termgroup.tpl:2
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Этот объект не является группой."
@@ -11587,21 +11631,6 @@ msgstr "Моя учетная запись"
 msgid "Removing object group failed"
 msgstr "Атрибуты UNIX"
 
-#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-msgid "Object groups"
-msgstr "Объединения"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:187
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Вы собираетесь удалить групповой объект \"%s\"."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:193
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-msgid "You are not allowed to delete this object group!"
-msgstr "У вас недостаточно прав для удаления этого группового объекта!"
-
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Название группы"
@@ -11947,40 +11976,56 @@ msgstr "Продолжительность"
 msgid "Phone reports"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/macro/parameter.tpl:3
+#: plugins/gofon/macro/class_divListMacros.inc:31
+#: plugins/gofon/macro/class_divListMacros.inc:32
+#: plugins/gofon/macro/headpage.tpl:6
 #, fuzzy
-msgid "Argument"
-msgstr "подÑ\80азделениÑ\8f"
+msgid "List of macros"
+msgstr "СпиÑ\81ок гÑ\80Ñ\83пп"
 
-#: plugins/gofon/macro/parameter.tpl:7
+#: plugins/gofon/macro/class_divListMacros.inc:36
+#: plugins/gofon/macro/headpage.tpl:24
 #, fuzzy
-msgid "type"
-msgstr "Тип"
+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/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/class_divListMacros.inc:47
 #, fuzzy
-msgid "Macro name"
-msgstr "Название"
-
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr ""
+msgid "Visible"
+msgstr "Переменная"
 
-#: plugins/gofon/macro/generic.tpl:22
+#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е веÑ\82кÑ\83 длÑ\8f гÑ\80Ñ\83ппÑ\8b"
+msgid "Regular expression for matching macro names"
+msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам гÑ\80Ñ\83пп"
 
-#: plugins/gofon/macro/generic.tpl:48
+#: plugins/gofon/macro/class_divListMacros.inc:83
 #, fuzzy
-msgid "Visible for user"
-msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
+msgid "Create new phone macro"
+msgstr "СоздаÑ\82Ñ\8c Ñ\82елеÑ\84оннÑ\8bй аккаÑ\83нÑ\82"
 
-#: plugins/gofon/macro/generic.tpl:57
+#: plugins/gofon/macro/class_divListMacros.inc:108
 #, fuzzy
-msgid "Macro text"
+msgid "Macro"
 msgstr "Название"
 
+#: plugins/gofon/macro/class_divListMacros.inc:109
+#, fuzzy
+msgid "visible"
+msgstr "Видимый всем"
+
+#: plugins/gofon/macro/class_divListMacros.inc:110
+#, fuzzy
+msgid "invisible"
+msgstr "Видимый всем"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
 msgid "Phone macros"
@@ -12088,40 +12133,29 @@ msgstr "Пожалуйста, укажите корректную кадрову
 msgid "Saving phone macro failed"
 msgstr "Аккаунт Proxy"
 
-#: plugins/gofon/macro/headpage.tpl:6
-#: plugins/gofon/macro/class_divListMacros.inc:31
-#: plugins/gofon/macro/class_divListMacros.inc:32
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 #, fuzzy
-msgid "List of macros"
-msgstr "СпиÑ\81ок гÑ\80Ñ\83пп"
+msgid "Macro name"
+msgstr "Ð\9dазвание"
 
-#: plugins/gofon/macro/headpage.tpl:24
-#: plugins/gofon/macro/class_divListMacros.inc:36
-#, 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."
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
 msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"группы пользователей. Если у вас их достаточно большое количество, вы можете "
-"использовать групповое выделение."
 
-#: plugins/gofon/macro/headpage.tpl:38
+#: plugins/gofon/macro/generic.tpl:22
 #, fuzzy
-msgid "Display macros matching"
-msgstr "Шаблон длÑ\8f гÑ\80Ñ\83пп"
+msgid "Choose subtree to place macro in"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е веÑ\82кÑ\83 длÑ\8f гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/gofon/macro/headpage.tpl:38
+#: plugins/gofon/macro/generic.tpl:48
 #, fuzzy
-msgid "Display macros  matching"
-msgstr "Шаблон длÑ\8f гÑ\80Ñ\83пп"
+msgid "Visible for user"
+msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
 
-#: plugins/gofon/macro/headpage.tpl:41
-#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/macro/generic.tpl:57
 #, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам гÑ\80Ñ\83пп"
+msgid "Macro text"
+msgstr "Ð\9dазвание"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 #, fuzzy
@@ -12166,43 +12200,33 @@ msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:396
 #, fuzzy
-msgid "Saving phone macro parameters failed"
-msgstr "Изменить дополнительные параметры приложения"
-
-#: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
-#, fuzzy
-msgid "Phone macro management"
-msgstr "Управление системами"
-
-#: plugins/gofon/macro/class_divListMacros.inc:47
-#, fuzzy
-msgid "Visible"
-msgstr "Переменная"
+msgid "Saving phone macro parameters failed"
+msgstr "Изменить дополнительные параметры приложения"
 
-#: plugins/gofon/macro/class_divListMacros.inc:83
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "Create new phone macro"
-msgstr "СоздаÑ\82Ñ\8c Ñ\82елеÑ\84оннÑ\8bй аккаÑ\83нÑ\82"
+msgid "Display macros matching"
+msgstr "Шаблон длÑ\8f гÑ\80Ñ\83пп"
 
-#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "Macro"
-msgstr "Ð\9dазвание"
+msgid "Display macros  matching"
+msgstr "Шаблон длÑ\8f гÑ\80Ñ\83пп"
 
-#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 #, fuzzy
-msgid "visible"
-msgstr "Ð\92идимÑ\8bй вÑ\81ем"
+msgid "Phone macro management"
+msgstr "УпÑ\80авление Ñ\81иÑ\81Ñ\82емами"
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
-msgid "invisible"
-msgstr "Ð\92идимÑ\8bй вÑ\81ем"
+msgid "Argument"
+msgstr "подÑ\80азделениÑ\8f"
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Ñ\82елеÑ\84она"
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Тип"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
 #, fuzzy
@@ -12333,6 +12357,11 @@ msgstr ""
 msgid "Removing phone account failed"
 msgstr "Удалить учетную запись POSIX"
 
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+#: plugins/gofon/phoneaccount/main.inc:122
+msgid "Phone settings"
+msgstr "Настройки телефона"
+
 #: plugins/gofon/phoneaccount/paste_generic.tpl:32
 #: plugins/gofon/phoneaccount/generic.tpl:33
 msgid "Voicemail PIN"
@@ -12350,6 +12379,65 @@ msgstr "Телефон"
 msgid "Phone macro"
 msgstr "Телефонные отчеты"
 
+#: plugins/gofon/conference/class_divListConferences.inc:31
+#: plugins/gofon/conference/class_divListConferences.inc:32
+#: plugins/gofon/conference/headpage.tpl:6
+#, fuzzy
+msgid "List of conference rooms"
+msgstr "Список групп"
+
+#: plugins/gofon/conference/class_divListConferences.inc:36
+#: plugins/gofon/conference/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"подразделения. Если у вас достаточно большое количество подразделений, вы "
+"можете использовать групповое выделение."
+
+#: plugins/gofon/conference/class_divListConferences.inc:46
+#, fuzzy
+msgid "Name - Number"
+msgstr "Номер телефона"
+
+#: plugins/gofon/conference/class_divListConferences.inc:48
+#: plugins/gofon/conference/generic.tpl:112
+msgid "PIN"
+msgstr ""
+
+#: plugins/gofon/conference/class_divListConferences.inc:55
+#, fuzzy
+msgid "Regular expression for matching conference names"
+msgstr "Регулярное выражение, соответствующее именам пользователей"
+
+#: plugins/gofon/conference/class_divListConferences.inc:84
+#, fuzzy
+msgid "Create new conference"
+msgstr "Создание нового объекта в"
+
+#: plugins/gofon/conference/class_divListConferences.inc:84
+#, fuzzy
+msgid "New conference"
+msgstr "Номер телефона"
+
+#: plugins/gofon/conference/class_divListConferences.inc:135
+#, fuzzy
+msgid "Conference"
+msgstr "Ссылки"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#, fuzzy
+msgid "Phone conferences"
+msgstr "Номер телефона"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+#, fuzzy
+msgid "Management"
+msgstr "Название"
+
 #: plugins/gofon/conference/generic.tpl:13
 #, fuzzy
 msgid "Conference name"
@@ -12375,11 +12463,6 @@ msgstr ""
 msgid "Preset PIN"
 msgstr "присутствует"
 
-#: plugins/gofon/conference/generic.tpl:112
-#: plugins/gofon/conference/class_divListConferences.inc:48
-msgid "PIN"
-msgstr ""
-
 #: plugins/gofon/conference/generic.tpl:118
 #, fuzzy
 msgid "Record conference"
@@ -12407,40 +12490,6 @@ msgstr ""
 msgid "Count users"
 msgstr "Страна"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-#, fuzzy
-msgid "Phone conferences"
-msgstr "Номер телефона"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-#, fuzzy
-msgid "Management"
-msgstr "Название"
-
-#: plugins/gofon/conference/headpage.tpl:6
-#: plugins/gofon/conference/class_divListConferences.inc:31
-#: plugins/gofon/conference/class_divListConferences.inc:32
-#, fuzzy
-msgid "List of conference rooms"
-msgstr "Список групп"
-
-#: plugins/gofon/conference/headpage.tpl:24
-#: plugins/gofon/conference/class_divListConferences.inc:36
-#, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"подразделения. Если у вас достаточно большое количество подразделений, вы "
-"можете использовать групповое выделение."
-
-#: plugins/gofon/conference/headpage.tpl:36
-#, fuzzy
-msgid "Regular expression for        matching user names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:215
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
@@ -12477,35 +12526,15 @@ msgstr ""
 msgid "Saving phone conference failed"
 msgstr "Аккаунт Proxy"
 
-#: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
-#, fuzzy
-msgid "Conference management"
-msgstr "Управление подразделениями"
-
-#: plugins/gofon/conference/class_divListConferences.inc:46
-#, fuzzy
-msgid "Name - Number"
-msgstr "Номер телефона"
-
-#: plugins/gofon/conference/class_divListConferences.inc:55
+#: plugins/gofon/conference/headpage.tpl:36
 #, fuzzy
-msgid "Regular expression for matching conference names"
+msgid "Regular expression for        matching user names"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
-#: plugins/gofon/conference/class_divListConferences.inc:84
-#, fuzzy
-msgid "Create new conference"
-msgstr "Создание нового объекта в"
-
-#: plugins/gofon/conference/class_divListConferences.inc:84
-#, fuzzy
-msgid "New conference"
-msgstr "Номер телефона"
-
-#: plugins/gofon/conference/class_divListConferences.inc:135
+#: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 #, fuzzy
-msgid "Conference"
-msgstr "СÑ\81Ñ\8bлки"
+msgid "Conference management"
+msgstr "УпÑ\80авление подÑ\80азделениÑ\8fми"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -12524,10 +12553,15 @@ msgstr "Контакт"
 msgid "This object has no relationship to other objects."
 msgstr "Данный объект не имеет ссылок на другие объекты"
 
+#: plugins/generic/welcome/main.inc:24
+#, php-format
+msgid "Welcome %s!"
+msgstr "Добро пожаловать %s!"
+
 #: plugins/generic/welcome/welcome.tpl:4
 #, fuzzy
 msgid ""
-"This is the GOsa main screen. You can select your tasks from the menu on the "
+"This is the GOsa main menu. You can select your tasks from the menu on the "
 "left, or by choosing one of the pictograms below. All changes apply directly "
 "to your companies LDAP server."
 msgstr ""
@@ -12548,11 +12582,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Команда разработчиков GOsa"
 
-#: plugins/generic/welcome/main.inc:24
-#, php-format
-msgid "Welcome %s!"
-msgstr "Добро пожаловать %s!"
-
 #: include/class_mail-methods-cyrus.inc:39
 msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
@@ -12618,6 +12647,64 @@ msgstr "Невозможно активировать сценарий  GOsa SIE
 msgid "This package has no debconf options."
 msgstr "В этой учетной записи нет атрибутов для телефона."
 
+#: include/class_plugin.inc:397
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
+
+#: include/class_plugin.inc:543
+#, php-format
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
+
+#: include/class_plugin.inc:577 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:611
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
+
+#: include/class_plugin.inc:917
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: include/class_plugin.inc:924
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: include/class_plugin.inc:938 include/class_plugin.inc:967
+msgid "Handle object tagging failed"
+msgstr ""
+
+#: include/class_plugin.inc:954
+#, php-format
+msgid "Removing tag from object '%s'"
+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/functions_setup.inc:84
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr "Не удается получить информацию о схемах. Проверка схем невозможна!"
@@ -12750,7 +12837,7 @@ msgstr "Поддержка Gofon отключена, не все схемы ус
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:254 include/functions.inc:992
+#: include/functions_setup.inc:254 include/functions.inc:1086
 msgid "OK"
 msgstr "OK"
 
@@ -13101,34 +13188,16 @@ msgstr ""
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
 
-#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:184
-#: 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, так что вы не сможете что-"
-"либо администрировать!"
-
-#: 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:181 include/class_plugin.inc:577
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
-
-#: include/class_password-methods.inc:202
+#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
+#: include/functions_setup.inc:1061 html/index.php:184
+#: ihtml/themes/altlinux/setup_useradmin.tpl:6
+#: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
 msgstr ""
-"Параметр SMBHASH в gosa.conf некорректен! Не удается сменить пароль Samba."
+"У вас нет учетной записи администратора для GOsa, так что вы не сможете что-"
+"либо администрировать!"
 
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
@@ -13155,22 +13224,22 @@ msgstr "Ошибка смены пароля в базе данных Kerberos!"
 msgid "XML error in guide.xml: %s at line %d"
 msgstr "Ошибка XML в gosa.conf: %s в строке %d"
 
-#: include/functions_helpviewer.inc:83
+#: include/functions_helpviewer.inc:84
 msgid "No help available for this plugin."
 msgstr ""
 
-#: include/functions_helpviewer.inc:92
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:191
 msgid "previous"
 msgstr ""
 
-#: include/functions_helpviewer.inc:96
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:195
 #, fuzzy
 msgid "next"
 msgstr "текст"
 
-#: include/functions_helpviewer.inc:384
+#: include/functions_helpviewer.inc:385
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid "%s results for your search with the keyword %s"
 msgstr ""
 
 #: include/functions_helpviewer.inc:459
@@ -13228,12 +13297,6 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:376
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -13263,7 +13326,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:366
+#: include/php_setup.inc:71 html/main.php:379
 #, fuzzy
 msgid "Toggle information"
 msgstr "Личная информация"
@@ -13321,13 +13384,13 @@ msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:376
+#: include/functions.inc:470
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr "Ошибка при создании блокировки. Заданные параметры некорректны."
 
-#: include/functions.inc:386
+#: include/functions.inc:480
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -13336,24 +13399,24 @@ msgstr ""
 "Не удается создать блокировку в базе данных LDAP. Проверьте, раздел config в "
 "файле gosa.conf! Ответ сервера: %s"
 
-#: include/functions.inc:401
+#: include/functions.inc:495
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr "Ошибка при создании блокировки. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:427
+#: include/functions.inc:521
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr "Ошибка при удалении блокировки. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:457
+#: include/functions.inc:551
 #, fuzzy
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr "Ошибка при чтении блокировки. Заданные параметры некорректны."
 
-#: include/functions.inc:467
+#: include/functions.inc:561
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -13361,7 +13424,7 @@ msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
 "\" в файле gosa.conf!"
 
-#: include/functions.inc:475
+#: include/functions.inc:569
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -13369,12 +13432,12 @@ msgstr ""
 "Для блокируемого объекта обнаружено несколько блокировок. Этого быть не "
 "должно, проверьте работу LDAP."
 
-#: include/functions.inc:561
+#: include/functions.inc:655
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:563
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -13383,41 +13446,41 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:580
+#: include/functions.inc:674
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:970 include/functions.inc:1159
+#: include/functions.inc:1064 include/functions.inc:1253
 msgid "LDAP error:"
 msgstr "Ошибка LDAP:"
 
-#: include/functions.inc:971
+#: include/functions.inc:1065
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:979
+#: include/functions.inc:1073
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:988
+#: include/functions.inc:1082
 msgid "An error occured while processing your request"
 msgstr ""
 
-#: include/functions.inc:1053
+#: include/functions.inc:1147
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Продолжить"
 
-#: include/functions.inc:1055
+#: include/functions.inc:1149
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Редактиовать объект"
 
-#: include/functions.inc:1057
+#: include/functions.inc:1151
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -13426,19 +13489,19 @@ msgstr ""
 "Вы собираетесь редактировать запись LDAP \"%s\", которая используется \"%s"
 "\". Пожалуйста, обратитесь к пользователю и уточните отношения."
 
-#: include/functions.inc:1341
+#: include/functions.inc:1435
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1369
+#: include/functions.inc:1463
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1643
+#: include/functions.inc:1737
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:1686
+#: include/functions.inc:1780
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -13474,7 +13537,13 @@ msgstr ""
 "Ваш конфигурационный файл gosa.conf был частично изменен. Пожалуйста, "
 "сконвертиуйте его используя скрипт fix_config.sh"
 
-#: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
+#: include/class_pluglist.inc:129 include/class_pluglist.inc:130
+#: include/class_pluglist.inc:229
+#, fuzzy
+msgid "Unknown"
+msgstr "состояние неизвестно"
+
+#: include/class_pluglist.inc:137 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
 msgid ""
@@ -13581,54 +13650,10 @@ msgstr ""
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_plugin.inc:397
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
-
-#: include/class_plugin.inc:543
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
-
-#: include/class_plugin.inc:611
-#, php-format
+#: include/class_MultiSelectWindow.inc:376
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
-
-#: include/class_plugin.inc:917
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
-
-#: include/class_plugin.inc:924
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
-
-#: include/class_plugin.inc:938 include/class_plugin.inc:967
-msgid "Handle object tagging failed"
-msgstr ""
-
-#: include/class_plugin.inc:954
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
-
-#: html/helpviewer.php:115
-#, fuzzy
-msgid "There is no helpfile specified for this class"
-msgstr "Метод '%s' не описан в вашем файле конфигурации."
-
-#: html/helpviewer.php:225
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
 
 #: html/getvcard.php:36
@@ -13802,20 +13827,37 @@ msgstr "Введите свой пароль!"
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:242 html/index.php:306
+#: html/index.php:225
+#, fuzzy
+msgid "Account locked. Please contact your system administrator."
+msgstr ""
+"Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
+"администратору."
+
+#: html/index.php:271 html/index.php:335
 msgid "Session will not be encrypted."
 msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
 
-#: html/index.php:242 html/index.php:306
+#: html/index.php:271 html/index.php:335
 msgid "Enter SSL session"
 msgstr "Использовать шифрование SSL"
 
-#: html/index.php:248
+#: html/index.php:277
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
+#: html/helpviewer.php:117
+#, fuzzy
+msgid "There is no helpfile specified for this class"
+msgstr "Метод '%s' не описан в вашем файле конфигурации."
+
+#: html/helpviewer.php:264
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Невозможно подключиться к серверу базы данных!"
@@ -13855,7 +13897,12 @@ msgstr "Предупреждение: нехватка памяти, увели
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "Не удается найти определение для модуля \"%s\"!"
 
-#: html/main.php:366
+#: html/main.php:354
+#, fuzzy
+msgid "Your password is about to expire, please change your password"
+msgstr "У вас недостаточно прав для смены своего пароля."
+
+#: html/main.php:379
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -13883,37 +13930,6 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Удалить"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"Ограничение на количество возвращаемых объектов позволяет ускорить операции "
-"поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ "
-"снизить время обработки запроса при обслуживаии большой базы данных это "
-"установить минимальное значение. Кроме того, будет очень полезно "
-"использовать фильтры для просмотра только ограниченного количества объектов."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Выберите тип реакции для данной сессии"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "игнорировать ошибку и показать все найденые объекты"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-#, fuzzy
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
-"позволить использовать фильтры"
-
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Конфликт сеансов"
@@ -13943,25 +13959,6 @@ msgstr ""
 msgid "Logout"
 msgstr "Выход"
 
-#: 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:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr "Каталог"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr "Войти"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr "Нажмите на эту кнопку, чтобы войти в систему"
-
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -13996,6 +13993,56 @@ msgid ""
 "create the missing entries."
 msgstr ""
 
+#: 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:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+msgid "Directory"
+msgstr "Каталог"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+msgid "Sign in"
+msgstr "Войти"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+msgid "Click here to log in"
+msgstr "Нажмите на эту кнопку, чтобы войти в систему"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"Ограничение на количество возвращаемых объектов позволяет ускорить операции "
+"поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ "
+"снизить время обработки запроса при обслуживаии большой базы данных это "
+"установить минимальное значение. Кроме того, будет очень полезно "
+"использовать фильтры для просмотра только ограниченного количества объектов."
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Выберите тип реакции для данной сессии"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr "игнорировать ошибку и показать все найденые объекты"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
+#, fuzzy
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
+"позволить использовать фильтры"
+
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -14016,6 +14063,20 @@ msgstr "Выход"
 msgid "Signed in:"
 msgstr "Пользователь:"
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Конфликт блокировок"
+
+#: ihtml/themes/altlinux/islocked.tpl:9
+msgid ""
+"If this 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>."
+
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
@@ -14034,20 +14095,6 @@ msgstr ""
 "На втором шаге происходит поиск вспомогательных программ и проверка "
 "допустимости их версии."
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Конфликт блокировок"
-
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this 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>."
-
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -14257,25 +14304,6 @@ msgstr ""
 "пользователь веб-сервера может его читать. Для этого вам, возможно, "
 "понадобится выполнить следующие команды:"
 
-#: ihtml/themes/default/islocked.tpl:9
-#, fuzzy
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the <i>Edit anyway</i> button."
-msgstr ""
-"Если результат этой проверки блокировки - ложь, очевидно, другой человек "
-"закрыл браузер во время редактирования данных. Вы можете удалить файл "
-"блокировки, нажав на кнопку <i>Удалить</i>."
-
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr ""
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr ""
@@ -14292,6 +14320,25 @@ msgstr ""
 msgid "Operation complete"
 msgstr "не полный"
 
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl:9
+#, fuzzy
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the <i>Edit anyway</i> button."
+msgstr ""
+"Если результат этой проверки блокировки - ложь, очевидно, другой человек "
+"закрыл браузер во время редактирования данных. Вы можете удалить файл "
+"блокировки, нажав на кнопку <i>Удалить</i>."
+
 #: ihtml/themes/default/setup_introduction.tpl:4
 #, fuzzy
 msgid ""
@@ -14374,6 +14421,16 @@ msgid ""
 "versions. In some cases it would be helpful to enable the error reporting."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Your password has expired. To change your personal password use the "
+#~ "fields below. The changes take effect immediately. Please memorize the "
+#~ "new password, because you wouldn't be able to login without it."
+#~ msgstr ""
+#~ "В полях ниже вы можете изменить свой пароль. Изменения вступят в силу "
+#~ "немедленно. Пожалуйста, запомните новый пароль, так как иначе вы не "
+#~ "сможете войти в систему."
+
 #, fuzzy
 #~ msgid "New Entry"
 #~ msgstr "Принтер"