Added dynamic acl divs for extended settings. Currently only firefox is supported.

[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 453b3e143e25f82373afb7ce8eb3cd3323ce9550..97a11cbb0874e99ef5f629d9039c5f95158ea752 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -1,11 +1,15 @@
 # Translation of messages.po to Russian
 # Valia V. Vaneeva <fattie@altlinux.ru>, 2004.
 # $Id: messages.po,v 1.61 2005/04/18 10:37:13 migor-guest Exp $
+#: plugins/personal/generic/class_user.inc:1338
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:115 include/class_plugin.inc:116
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"Report-Msgid-Bugs-To: Igor Muratov <migor@altlinux.org>\n"
-"POT-Creation-Date: 2004-06-01 13:40+0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-28 12:39+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -14,211 +18,231 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1350
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Администрирование"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Дополнительно"
 
-#: contrib/gosa.conf:74 contrib/gosa.conf:87 contrib/gosa.conf:96
-#: contrib/gosa.conf:102 contrib/gosa.conf:107 contrib/gosa.conf:113
-#: contrib/gosa.conf:122 contrib/gosa.conf:138 contrib/gosa.conf:147
-#: contrib/gosa.conf:152 contrib/gosa.conf:157 contrib/gosa.conf:162
-#: contrib/gosa.conf:167 contrib/gosa.conf:172
+#: contrib/gosa.conf:80 contrib/gosa.conf:93 contrib/gosa.conf:97
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:114
+#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
+#: contrib/gosa.conf:144 contrib/gosa.conf:148 contrib/gosa.conf:170
+#: contrib/gosa.conf:174 contrib/gosa.conf:178 contrib/gosa.conf:182
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1345
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:787
+#: plugins/admin/systems/class_componentGeneric.inc:233
+#: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/fai/faiVariable.tpl:4
+#: plugins/admin/systems/goMailServer.tpl:1
+#: plugins/admin/systems/goImapServer.tpl:1
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.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/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
+#: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
+#: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Общее"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:81
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/users/class_userManagement.inc:839
+#: plugins/personal/environment/class_environment.inc:1146
+#: plugins/admin/groups/class_divListGroup.inc:149
+#: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
 msgstr "Окружение"
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:511
-#: plugins/admin/users/class_userManagement.inc:841
-#: plugins/admin/ogroups/tabs_ogroups.inc:72
-#: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
+#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/admin/groups/class_groupMail.inc:980
+#: plugins/admin/groups/class_divListGroup.inc:141
+#: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
+#: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Почта"
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:514
-#: plugins/admin/users/class_userManagement.inc:847
+#: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1016
+#: plugins/admin/groups/class_divListGroup.inc:143
+#: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_divListUsers.inc:173
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:176
 msgid "Connectivity"
 msgstr "Подключение"
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
-#: plugins/personal/generic/generic.tpl:398
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:845
-#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/users/class_divListUsers.inc:169
+#: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Факс"
 
-#: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:388
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/users/class_userManagement.inc:843
-#: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:928
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:167
+#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/systems/class_systemManagement.inc:774
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:596
+#: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Телефон"
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:83 contrib/gosa.conf:92 contrib/gosa.conf:98
-#: contrib/gosa.conf:103 contrib/gosa.conf:109 contrib/gosa.conf:118
-#: contrib/gosa.conf:134 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:153 contrib/gosa.conf:158 contrib/gosa.conf:163
-#: contrib/gosa.conf:168 contrib/gosa.conf:173
-msgid "References"
-msgstr "Ссылки"
-
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:57
+#: plugins/admin/mimetypes/generic.tpl:90
+#: plugins/admin/mimetypes/generic.tpl:131
 msgid "Applications"
 msgstr "Приложения"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:101 include/class_tabs.inc:295
 msgid "ACL"
 msgstr "Доступ"
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:67
+#: contrib/gosa.conf:106 plugins/admin/applications/generic.tpl:73
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:250
+#: plugins/admin/systems/class_servRepository.inc:246
 #: plugins/admin/ogroups/phonequeue.tpl:31
-#: plugins/gofon/conference/generic.tpl:87
+#: plugins/gofon/conference/generic.tpl:92
 msgid "Options"
 msgstr "Параметры"
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:115 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 #, fuzzy
 msgid "Parameter"
 msgstr "Параметры загрузки"
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
-#: plugins/admin/ogroups/tabs_ogroups.inc:92
+#: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Запуск"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
+#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: plugins/admin/ogroups/tabs_ogroups.inc:102
 msgid "Devices"
 msgstr "Устройства"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
-#: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:934
-#: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:599
+#: contrib/gosa.conf:122 contrib/gosa.conf:138
+#: plugins/personal/environment/environment.tpl:228
+#: plugins/admin/systems/class_systemManagement.inc:783
+#: plugins/admin/systems/class_printGeneric.inc:793
+#: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Принтер"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/gofax/blocklists/generic.tpl:70
+#: contrib/gosa.conf:123 contrib/gosa.conf:131 contrib/gosa.conf:139
+#: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:20 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:24
+#: ihtml/themes/default/MultiSelectWindow.tpl:64
 msgid "Information"
 msgstr "Информация"
 
-#: contrib/gosa.conf:123
-msgid "Databases"
-msgstr "Базы данных"
-
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:129 plugins/admin/systems/servkolab.tpl:26
 msgid "Services"
 msgstr "Сервисы"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
-#: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/fai/faiPackage.tpl:29
-#, fuzzy
-msgid "Repository"
-msgstr "Повторить"
+#: contrib/gosa.conf:130 contrib/gosa.conf:140
+msgid "FAI summary"
+msgstr ""
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:193
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:204 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -227,97 +251,107 @@ msgstr ""
 msgid "Export"
 msgstr "Экспорт"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:205
 #, fuzzy
 msgid "Excel Export"
 msgstr "Экспорт"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:145
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
-#: plugins/admin/applications/generic.tpl:95
+#: plugins/addons/ldapmanager/contentimport.tpl:50
+#: plugins/addons/notifications/contents.tpl:52
+#: plugins/admin/applications/generic.tpl:101
 msgid "Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:207
 #, fuzzy
 msgid "CSV Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:211
 #, fuzzy
 msgid "Partitions"
 msgstr "Назначение"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:93
+#: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 #, fuzzy
 msgid "Script"
 msgstr "Путь к сценариям"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:768
-#: plugins/admin/fai/class_faiManagement.inc:769
+#: contrib/gosa.conf:219 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:761
-#: plugins/admin/fai/class_faiManagement.inc:762
+#: contrib/gosa.conf:223 plugins/admin/fai/class_faiSummaryTab.inc:41
 #, fuzzy
 msgid "Variables"
 msgstr "Переменная"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:782
-#: plugins/admin/fai/class_faiManagement.inc:783
+#: contrib/gosa.conf:227 plugins/admin/fai/class_faiSummaryTab.inc:42
 #, fuzzy
 msgid "Templates"
 msgstr "Шаблон"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:11
+#: plugins/admin/fai/class_faiSummaryTab.inc:45
 #, fuzzy
 msgid "Profiles"
 msgstr "Путь к профилю"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:232 plugins/admin/ogroups/tabs_ogroups.inc:107
+#: plugins/admin/acl/class_divListACL.inc:49
+msgid "Summary"
+msgstr ""
+
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 #, fuzzy
 msgid "Packages"
 msgstr "Показать телефоны"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:258
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:277 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Немецкий"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:278
 msgid "Russian"
 msgstr "Русский"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:279
 msgid "Spanish"
 msgstr "Испанский"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:280
 msgid "French"
 msgstr "Французский"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:281
 msgid "Dutch"
 msgstr "Датский"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:282
 msgid "English"
 msgstr "Английский"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:283
 msgid "Italian"
 msgstr ""
 
+#: contrib/gosa.conf:284
+#, fuzzy
+msgid "Polish"
+msgstr "Английский"
+
 #: plugins/personal/mail/mail_locals.tpl:6
 #: plugins/admin/groups/mail_locals.tpl:6
 msgid "Select addresses to add"
@@ -328,15 +362,11 @@ msgstr "Выберите адреса для добавления"
 #: plugins/personal/samba/samba3_workstations.tpl:20
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:47
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/systems/servRepository.tpl:36
@@ -344,19 +374,18 @@ msgstr "Выберите адреса для добавления"
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
-#: plugins/admin/ogroups/headpage.tpl:29
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/fai/headpage.tpl:64 plugins/admin/fai/faiProfileEntry.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:35
+#: ihtml/themes/default/MultiSelectWindow.tpl:75
 msgid "Filters"
 msgstr "Фильтры"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:34
+#: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
@@ -387,47 +416,50 @@ msgid "User name of which addresses are shown"
 msgstr "Имя пользователя, адрес которого показан"
 
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
+#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:164
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/posix/posix_groups.tpl:69
+#: plugins/personal/posix/generic.tpl:88
+#: plugins/personal/posix/generic.tpl:126
+#: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/paste_generic.tpl:61
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:407
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/connectivity/class_kolabAccount.inc:203
-#: plugins/personal/environment/environment.tpl:121
-#: plugins/personal/environment/environment.tpl:138
-#: plugins/personal/environment/environment.tpl:182
+#: plugins/personal/connectivity/kolab.tpl:53
+#: plugins/personal/connectivity/class_kolabAccount.inc:245
+#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:174
+#: plugins/personal/environment/environment.tpl:241
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/gofax/blocklists/generic.tpl:63
+#: 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/groups/mail.tpl:51
 #: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/application.tpl:27
-#: plugins/admin/groups/class_groupMail.inc:534
-#: plugins/admin/groups/generic.tpl:104
+#: plugins/admin/groups/class_groupMail.inc:540
+#: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/terminal.tpl:99
+#: plugins/admin/systems/workstation.tpl:78
 #: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/goNtpServer.tpl:13
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
 #: plugins/admin/systems/glpi.tpl:100
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/phonesettings.tpl:178
+#: plugins/admin/systems/phonesettings.tpl:193
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:61
-#: plugins/admin/systems/workstationStartup.tpl:81
-#: plugins/admin/systems/workstationStartup.tpl:100
+#: plugins/admin/systems/workstationStartup.tpl:103
+#: plugins/admin/systems/workstationStartup.tpl:124
+#: plugins/admin/systems/workstationStartup.tpl:143
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/servRepositorySetup.tpl:36
@@ -435,69 +467,84 @@ msgstr "Имя пользователя, адрес которого показ
 #: plugins/admin/systems/glpiManufacturer.tpl:6
 #: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:426
-#: plugins/admin/systems/class_termDNS.inc:446
+#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:480
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/servdnseditzone.tpl:106
-#: plugins/admin/systems/class_servDNSeditZone.inc:478
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:388
-#: plugins/admin/ogroups/generic.tpl:39
+#: plugins/admin/systems/class_servDNSeditZone.inc:486
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
+#: plugins/admin/systems/goMailServer.tpl:56
+#: plugins/admin/systems/goMailServer.tpl:79
+#: plugins/admin/systems/goMailServer.tpl:96
+#: plugins/admin/systems/goMailServer.tpl:120
+#: plugins/admin/systems/goMailServer.tpl:136
+#: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
-#: plugins/admin/fai/faiVariable.tpl:44
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
 #: 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:41
-#: plugins/admin/fai/faiHook.tpl:41 plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:43
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:43
+#: plugins/admin/mimetypes/generic.tpl:87
+#: plugins/admin/mimetypes/generic.tpl:93
+#: plugins/admin/mimetypes/generic.tpl:134
+#: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
 msgstr "Добавить"
 
 #: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
-#: plugins/personal/posix/posix_groups.tpl:71
+#: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/posix/main.inc:102 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:148
+#: plugins/personal/generic/generic_certs.tpl:94
 #: plugins/personal/connectivity/main.inc:120
-#: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/main.inc:97
 #: 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/nagios/main.inc:106
-#: plugins/gofax/blocklists/generic.tpl:82
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
+#: plugins/gofax/blocklists/generic.tpl:91
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:422
+#: plugins/admin/groups/class_groupManagement.inc:336
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:633
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:356
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:374
-#: plugins/admin/systems/class_systemManagement.inc:728
-#: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/departments/class_departmentManagement.inc:300
+#: plugins/admin/systems/class_systemManagement.inc:494
+#: plugins/admin/systems/servdns.tpl:23
+#: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goNtpServer.tpl:24
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/systems/servRepository.tpl:66
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/goFonServer.tpl:26
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
 #: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
@@ -506,15 +553,27 @@ msgstr "Добавить"
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/servdnseditzone.tpl:122
+#: plugins/admin/systems/servdnseditzone.tpl:120
 #: plugins/admin/systems/SelectDeviceType.tpl:45
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/ServiceAddDialog.tpl:31
+#: plugins/admin/systems/goKrbServer.tpl:21
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
+#: plugins/admin/systems/goImapServer.tpl:96
+#: plugins/admin/systems/goSyslogServer.tpl:8
+#: plugins/admin/systems/goGlpiServer.tpl:26
+#: plugins/admin/systems/goCupsServer.tpl:8
+#: plugins/admin/systems/goTerminalServer.tpl:19
+#: plugins/admin/systems/goFaxServer.tpl:18
+#: plugins/admin/systems/goLogDBServer.tpl:18
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:410
-#: plugins/admin/ogroups/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:608
-#: plugins/admin/fai/class_faiManagement.inc:613
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -523,16 +582,20 @@ msgstr "Добавить"
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiPackageNew.tpl:51
 #: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:351
+#: plugins/admin/mimetypes/remove.tpl:15
 #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:307
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:267
-#: plugins/gofon/conference/remove.tpl:16
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/copyPasteDialog.tpl:15
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
+#: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:15
+#: ihtml/themes/default/snapshotdialog.tpl:39
+#: ihtml/themes/default/snapshotdialog.tpl:82
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -542,241 +605,241 @@ msgstr "Отмена"
 msgid "Primary address"
 msgstr "Основной адрес"
 
-#: plugins/personal/mail/generic.tpl:11
+#: plugins/personal/mail/generic.tpl:15
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:929
+#: plugins/admin/systems/class_servGeneric.inc:321
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:595
+#: plugins/admin/ogroups/class_ogroupManagement.inc:386
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Сервер"
 
-#: plugins/personal/mail/generic.tpl:14
+#: plugins/personal/mail/generic.tpl:18
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Выберите почтовый сервер для учетной записи пользователя"
 
-#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
+#: plugins/personal/mail/generic.tpl:28 plugins/admin/groups/mail.tpl:25
 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_printGeneric.inc:472
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_printGeneric.inc:480
 msgid "not defined"
 msgstr "не определена"
 
-#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
+#: plugins/personal/mail/generic.tpl:40
+#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Размер квоты"
 
-#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:25
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/copypaste.tpl:25
 #: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 #, fuzzy
 msgid "Alternative addresses"
 msgstr "Альтернативные адреса"
 
-#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:55
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/copypaste.tpl:55
 #: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
-#: plugins/admin/systems/phonesettings.tpl:170
-#: plugins/admin/systems/phonesettings.tpl:185
+#: plugins/admin/systems/phonesettings.tpl:172
+#: plugins/admin/systems/phonesettings.tpl:187
 msgid "List of alternative mail addresses"
 msgstr "Список альтернативных адресов эл. почты"
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
+#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:170
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62
-#: plugins/personal/posix/generic.tpl:74
-#: plugins/personal/posix/generic.tpl:104
+#: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/generic.tpl:129
 #: plugins/personal/posix/paste_generic.tpl:62
-#: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/connectivity/kolab.tpl:20
-#: plugins/personal/environment/environment.tpl:139
-#: plugins/personal/environment/environment.tpl:167
-#: plugins/personal/environment/environment.tpl:183
-#: plugins/gofax/blocklists/generic.tpl:64
+#: plugins/personal/samba/samba3.tpl:410
+#: plugins/personal/connectivity/kolab.tpl:56
+#: plugins/personal/environment/environment.tpl:180
+#: plugins/personal/environment/environment.tpl:218
+#: plugins/personal/environment/environment.tpl:244
+#: plugins/personal/environment/class_environment.inc:636
+#: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/mail.tpl:52
 #: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
-#: plugins/admin/groups/generic.tpl:106 plugins/admin/groups/paste_mail.tpl:31
+#: 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/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/terminal.tpl:101 plugins/admin/systems/printer.tpl:76
+#: plugins/admin/systems/printer.tpl:92
+#: plugins/admin/systems/workstation.tpl:80
 #: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/goNtpServer.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/workstationStartup.tpl:62
-#: plugins/admin/systems/workstationStartup.tpl:82
+#: plugins/admin/systems/phonesettings.tpl:179
+#: plugins/admin/systems/phonesettings.tpl:194
+#: plugins/admin/systems/workstationStartup.tpl:104
+#: plugins/admin/systems/workstationStartup.tpl:125
 #: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:440
+#: plugins/admin/systems/class_termDNS.inc:474
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:292
-#: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: plugins/admin/systems/goShareServer.tpl:12
+#: 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/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:46
+#: plugins/admin/fai/remove.tpl:15 plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/fai/remove_branch.tpl:14
+#: plugins/admin/mimetypes/remove.tpl:13
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
+#: ihtml/themes/default/remove.tpl:13
 msgid "Delete"
 msgstr "Удалить"
 
-#: plugins/personal/mail/generic.tpl:67
+#: plugins/personal/mail/generic.tpl:80
 msgid "Mail options"
 msgstr "Почтовые настройки"
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:86
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "Выберите, нужно ли оставлять копии перенаправляемых сообщений"
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:86
 msgid "No delivery to own mailbox"
 msgstr "Не оставлять копии в своем почтовом ящике"
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:91
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Выберите, чтобы включить автоответчик с сообщением, указанным ниже"
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:91
 msgid "Activate vacation message"
 msgstr "Включить автоответчик"
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:99
 #, fuzzy
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr "Выберите, нужно ли фильтровать сообщения с помощью SpamAssassin"
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:101
 msgid "Move mails tagged with spam level greater than"
 msgstr "Перемещать сообщения с меткой рекламы больше"
 
-#: plugins/personal/mail/generic.tpl:84
+#: plugins/personal/mail/generic.tpl:104
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 "Выберите метку рекламы - чем меньше значение, тем чувствительнее фильтр"
 
-#: plugins/personal/mail/generic.tpl:87
+#: plugins/personal/mail/generic.tpl:108
 msgid "to folder"
 msgstr "в папку"
 
-#: plugins/personal/mail/generic.tpl:94
+#: plugins/personal/mail/generic.tpl:118
 msgid "Reject mails bigger than"
 msgstr "Отклонять сообщения размером больше"
 
-#: plugins/personal/mail/generic.tpl:96
-#: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
-#: plugins/personal/environment/environment.tpl:45
+#: plugins/personal/mail/generic.tpl:122
+#: plugins/personal/connectivity/pureftpd.tpl:60
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/personal/environment/environment.tpl:55
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "Мб"
 
-#: plugins/personal/mail/generic.tpl:102
+#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/class_mailAccount.inc:1000
 msgid "Vacation message"
 msgstr "Сообщение автоответчика"
 
-#: plugins/personal/mail/generic.tpl:119
+#: plugins/personal/mail/generic.tpl:151
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "Перенаправлять сообщения"
 
-#: plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/generic.tpl:167
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr "Добавить локально"
 
-#: plugins/personal/mail/generic.tpl:140
+#: plugins/personal/mail/generic.tpl:178
 msgid "Advanced mail options"
 msgstr "Дополнительные почтовые настройки"
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:184
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Выберите, может ли пользователь отправлять и получать сообщения только "
 "внутри своего домена"
 
-#: plugins/personal/mail/generic.tpl:146
+#: plugins/personal/mail/generic.tpl:186
 msgid "User is only allowed to send and receive local mails"
 msgstr "Пользователь может отправлять и получать почту только локально"
 
-#: plugins/personal/mail/generic.tpl:153
+#: plugins/personal/mail/generic.tpl:195
+#: plugins/personal/mail/class_mailAccount.inc:1015
 msgid "Use custom sieve script"
 msgstr "Использовать другой сценарий SIEVE"
 
-#: plugins/personal/mail/generic.tpl:153
+#: plugins/personal/mail/generic.tpl:195
 msgid "disables all Mail options!"
 msgstr "отключает все почтовые настройки!"
 
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:100
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:146
 #: plugins/personal/connectivity/main.inc:118
-#: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
-#: plugins/personal/nagios/main.inc:104
-#: plugins/gofax/blocklists/generic.tpl:80
+#: plugins/personal/environment/main.inc:95
+#: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:104
+#: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:712
-#: plugins/admin/applications/class_applicationManagement.inc:433
-#: plugins/admin/departments/class_departmentManagement.inc:372
-#: plugins/admin/systems/class_systemManagement.inc:726
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/servdnseditzone.tpl:121
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/ogroups/class_ogroupManagement.inc:408
-#: plugins/admin/fai/class_faiManagement.inc:606
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/users/class_userManagement.inc:627
+#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:332
+#: plugins/admin/fai/class_faiManagement.inc:585
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:305
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:265
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:14
-msgid "Save"
-msgstr "Сохранить"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+msgid "Ok"
+msgstr ""
 
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:111
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:167
 #: plugins/personal/connectivity/main.inc:128
-#: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/environment/main.inc:106
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
 
-#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
+#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:113
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:129
-#: plugins/personal/environment/environment.tpl:140
-#: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/environment/environment.tpl:177
+#: plugins/personal/environment/main.inc:107
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: 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/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/printer.tpl:52 plugins/admin/systems/servdns.tpl:7
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82 plugins/admin/systems/glpi.tpl:48
 #: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
@@ -784,9 +847,9 @@ msgstr "Нажмите 'Изменить' чтобы отредактирова
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
 #: plugins/admin/systems/servdnseditzone.tpl:31
+#: plugins/admin/systems/goShareServer.tpl:11
 #: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiTemplate.tpl:42
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Изменить"
@@ -795,7 +858,9 @@ msgstr "Изменить"
 msgid "User mail settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+#: plugins/personal/mail/copypaste.tpl:1
+#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/admin/groups/paste_mail.tpl:1
 #, fuzzy
 msgid "Mail settings"
 msgstr "Почтовые настройки пользователя"
@@ -829,40 +894,43 @@ msgstr "Почтовые настройки пользователя"
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:11
+#: plugins/addons/notifications/class_msgplug.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/admin/acl/class_aclManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/fonreports/class_fonreport.inc:7 include/class_acl.inc:7
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/personal/mail/class_mailAccount.inc:90
 #: 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:180
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
 
-#: plugins/personal/mail/class_mailAccount.inc:220
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "В этой учетной записи нет почтовых расширений."
 
-#: plugins/personal/mail/class_mailAccount.inc:229
-#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/mail/class_mailAccount.inc:230
-#: plugins/admin/groups/class_groupMail.inc:315
+#: plugins/personal/mail/class_mailAccount.inc:259
+#: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -870,14 +938,14 @@ msgstr ""
 "В этой учетной записи есть настройки электронной почты. Вы можете удалить "
 "их, щелкнув ниже."
 
-#: plugins/personal/mail/class_mailAccount.inc:232
-#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:261
+#: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Создать настройки запись эл. почты"
 
-#: plugins/personal/mail/class_mailAccount.inc:232
-#: plugins/admin/groups/class_groupMail.inc:318
+#: plugins/personal/mail/class_mailAccount.inc:261
+#: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -885,22 +953,22 @@ msgstr ""
 "В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
 "щелкнув ниже."
 
-#: plugins/personal/mail/class_mailAccount.inc:280
+#: plugins/personal/mail/class_mailAccount.inc:313
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
 "кому должны пересылаться сообщения."
 
-#: plugins/personal/mail/class_mailAccount.inc:286
-#: plugins/admin/groups/class_groupMail.inc:377
+#: plugins/personal/mail/class_mailAccount.inc:319
+#: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Добавление своего единственного адреса к списку пересылки не имеет смысла."
 
-#: plugins/personal/mail/class_mailAccount.inc:321
-#: plugins/personal/mail/class_mailAccount.inc:326
-#: plugins/admin/groups/class_groupMail.inc:405
+#: plugins/personal/mail/class_mailAccount.inc:349
+#: plugins/personal/mail/class_mailAccount.inc:354
+#: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -908,57 +976,155 @@ msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку "
 "альтернативных адресов."
 
-#: plugins/personal/mail/class_mailAccount.inc:336
-#: plugins/admin/groups/class_groupMail.inc:410
+#: plugins/personal/mail/class_mailAccount.inc:364
+#: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: plugins/personal/mail/class_mailAccount.inc:720
+#: plugins/personal/mail/class_mailAccount.inc:614
+#, fuzzy, php-format
+msgid "Removing of user/mail account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:716
+#, fuzzy, php-format
+msgid "Saving of user/mail account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:764
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:725
-#: plugins/admin/groups/class_groupMail.inc:807
+#: plugins/personal/mail/class_mailAccount.inc:769
+#: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/personal/mail/class_mailAccount.inc:729
-#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/personal/mail/class_mailAccount.inc:773
+#: plugins/personal/mail/class_mailAccount.inc:777
 #: 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:739
-#: plugins/admin/groups/class_groupMail.inc:816
+#: plugins/personal/mail/class_mailAccount.inc:783
+#: plugins/admin/groups/class_groupMail.inc:812
 #: 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:745
-#: plugins/admin/groups/class_groupMail.inc:822
+#: plugins/personal/mail/class_mailAccount.inc:789
+#: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: plugins/personal/mail/class_mailAccount.inc:754
-#: plugins/admin/groups/class_groupMail.inc:831
+#: plugins/personal/mail/class_mailAccount.inc:798
+#: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
 
-#: plugins/personal/mail/class_mailAccount.inc:764
-#: plugins/admin/groups/class_groupMail.inc:839
+#: plugins/personal/mail/class_mailAccount.inc:808
+#: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
 
-#: plugins/personal/mail/class_mailAccount.inc:768
+#: plugins/personal/mail/class_mailAccount.inc:812
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
+#: plugins/personal/mail/class_mailAccount.inc:852
+#: plugins/personal/mail/class_mailAccount.inc:864
+#, fuzzy
+msgid "You are not allowed to write mail forwarding."
+msgstr "Вам не разрешено менять пароль."
+
+#: plugins/personal/mail/class_mailAccount.inc:896
+#: plugins/personal/mail/class_mailAccount.inc:907
+#, fuzzy
+msgid "You are not allowed to write mail alternate address."
+msgstr "У вас недостаточно прав для удаления этого объекта!"
+
+#: plugins/personal/mail/class_mailAccount.inc:972
+msgid "Waiting for kolab to remove mail properties."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:974
+msgid ""
+"Please remove the mail account first, to allow kolab to call its remove "
+"methods."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
+#, fuzzy
+msgid "Mail address"
+msgstr "MAC-адрес"
+
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/admin/groups/class_groupMail.inc:992
+#: plugins/admin/systems/servservice.tpl:107
+#, fuzzy
+msgid "Mail server"
+msgstr "Сервер"
+
+#: plugins/personal/mail/class_mailAccount.inc:999
+#, fuzzy
+msgid "Add vacation information"
+msgstr "Информация об организации"
+
+#: plugins/personal/mail/class_mailAccount.inc:1002
+msgid "Use spam filter"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1003
+#, fuzzy
+msgid "Spam level"
+msgstr "Уровень информативности"
+
+#: plugins/personal/mail/class_mailAccount.inc:1004
+#, fuzzy
+msgid "Spam mail box"
+msgstr "Размер квоты"
+
+#: plugins/personal/mail/class_mailAccount.inc:1006
+#, fuzzy
+msgid "Reject due to mailsize"
+msgstr "Отклонять сообщения размером больше"
+
+#: plugins/personal/mail/class_mailAccount.inc:1007
+#, fuzzy
+msgid "Mail max size"
+msgstr "Размер квоты"
+
+#: plugins/personal/mail/class_mailAccount.inc:1009
+#: plugins/personal/mail/class_mailAccount.inc:1014
+#, fuzzy
+msgid "Forwarding address"
+msgstr "Основной адрес"
+
+#: plugins/personal/mail/class_mailAccount.inc:1010
+#, fuzzy
+msgid "Local delivery"
+msgstr "Последняя доставка"
+
+#: plugins/personal/mail/class_mailAccount.inc:1011
+msgid "Only insider delivery"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1012
+#, fuzzy
+msgid "Mail alternative addresses"
+msgstr "Альтернативные адреса"
+
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:786
-#: plugins/admin/users/class_userManagement.inc:793
+#: plugins/admin/users/class_divListUsers.inc:224
 msgid "Change password"
 msgstr "Сменить пароль"
 
@@ -1018,19 +1184,15 @@ msgstr ""
 "использующих его программ."
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:169
+#: plugins/personal/generic/main.inc:157
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
-#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentimport.tpl:45
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: plugins/admin/departments/recursive_move.tpl:18
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1367
-#: 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/altlinux/setup_useradmin.tpl:40
+#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/admin/departments/dep_iframe.tpl:19
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1477
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1041,17 +1203,36 @@ msgstr "Назад"
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/class_systemManagement.inc:878
 #: 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/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
+#: plugins/admin/systems/goFonServer.tpl:8
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/systems/goKrbServer.tpl:12
+#: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
+#: plugins/admin/systems/goGlpiServer.tpl:9
+#: plugins/admin/systems/goFaxServer.tpl:8
+#: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
+#: ihtml/themes/default/login.tpl:41
 #: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Пароль"
 
+#: plugins/personal/password/nochange.tpl:2
+#, fuzzy
+msgid "Password change not allowed"
+msgstr "Сменить пароль"
+
+#: plugins/personal/password/nochange.tpl:6
+#, fuzzy
+msgid "You are not allowed to change your password at this time"
+msgstr "Вам не разрешено менять пароль."
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -1062,15 +1243,15 @@ msgstr "Введенный вами текущий пароль не совпа
 msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
-#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:347
+#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:74
+#: plugins/admin/users/class_userManagement.inc:219
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Введенные пароли не совпадают!"
 
-#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:352
+#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:79
+#: plugins/admin/users/class_userManagement.inc:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Вы не указали новый пароль."
 
@@ -1091,21 +1272,24 @@ msgid "External password changer reported a problem: "
 msgstr "При попытке сменить пароль извне возникла проблема: "
 
 #: plugins/personal/posix/generic.tpl:7
+#: plugins/personal/posix/class_posixAccount.inc:1259
 #: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
+#: plugins/personal/samba/class_sambaAccount.inc:621
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: plugins/personal/posix/generic.tpl:13
+#: plugins/personal/posix/generic.tpl:15
+#: plugins/personal/posix/class_posixAccount.inc:1260
 msgid "Shell"
 msgstr "Оболочка"
 
-#: plugins/personal/posix/generic.tpl:21
+#: plugins/personal/posix/generic.tpl:25
 msgid "Primary group"
 msgstr "Основная группа"
 
-#: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/posix/generic.tpl:35
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1113,41 +1297,42 @@ msgstr "Основная группа"
 msgid "Status"
 msgstr "Состояние"
 
-#: plugins/personal/posix/generic.tpl:39
+#: plugins/personal/posix/generic.tpl:47
 #: plugins/personal/posix/paste_generic.tpl:23
 msgid "Force UID/GID"
 msgstr "Указать UID/GID вручную"
 
-#: plugins/personal/posix/generic.tpl:43
+#: plugins/personal/posix/generic.tpl:51
 #: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/generic.tpl:52
+#: plugins/personal/posix/generic.tpl:62
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/generic.tpl:64
+#: plugins/personal/posix/generic.tpl:76
 #: plugins/personal/posix/paste_generic.tpl:47
 msgid "Group membership"
 msgstr "Членство в группах"
 
-#: plugins/personal/posix/generic.tpl:66
+#: plugins/personal/posix/generic.tpl:78
 #: plugins/personal/posix/paste_generic.tpl:54
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr ""
 "(Предупреждение: NFS не поддерживает более 16 групп для одного пользователя!)"
 
-#: plugins/personal/posix/generic.tpl:84
+#: plugins/personal/posix/generic.tpl:102
 msgid "Account"
 msgstr "Учетная запись"
 
-#: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/generic.tpl:109
 msgid "System trust"
 msgstr "Системные доверия"
 
-#: plugins/personal/posix/generic.tpl:92
+#: plugins/personal/posix/generic.tpl:110
 #, fuzzy
 msgid "Trust mode"
 msgstr "Режим"
@@ -1156,36 +1341,50 @@ msgstr "Режим"
 msgid "Select groups to add"
 msgstr "Выберите группы для добавления"
 
-#: plugins/personal/posix/posix_groups.tpl:31
+#: plugins/personal/posix/posix_groups.tpl:32
 msgid "Display groups of department"
 msgstr "Объединения в подразделении"
 
-#: plugins/personal/posix/posix_groups.tpl:43
-#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:68
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/applications/class_divListApplication.inc:55
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
+msgid "Ignore subtrees"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:53
 msgid "Display groups matching"
 msgstr "Шаблон для групп"
 
-#: plugins/personal/posix/posix_groups.tpl:47
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/personal/posix/posix_groups.tpl:57
+#: plugins/admin/groups/class_divListGroup.inc:71
+#: plugins/admin/ogroups/class_divListOGroup.inc:78
 msgid "Regular expression for matching group names"
 msgstr "Регулярное выражение, соответствующее именам групп"
 
-#: plugins/personal/posix/posix_groups.tpl:54
-#: plugins/admin/groups/headpage.tpl:75
+#: plugins/personal/posix/posix_groups.tpl:64
 msgid "Display groups of user"
 msgstr "Показать группы пользователей"
 
-#: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/admin/groups/class_divListGroup.inc:72
 msgid "User name of which groups are shown"
 msgstr "Имя пользователя, для которого перечисляются группы"
 
-#: plugins/personal/posix/posix_shadow.tpl:5
+#: plugins/personal/posix/posix_shadow.tpl:9
 msgid "User must change password on first login"
 msgstr "Пользователь должен сменить пароль при первом входе в систему"
 
-#: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/posix/posix_shadow.tpl:34
+#: plugins/personal/samba/samba2.tpl:87 plugins/personal/samba/samba3.tpl:311
 msgid "Password expires on"
 msgstr "Срок действия пароля истекает"
 
@@ -1198,11 +1397,11 @@ msgid "Display systems of department"
 msgstr "Показать системы в подразделении"
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:75
 msgid "Display systems matching"
 msgstr "Показать подходяшие системы"
 
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:121
 msgid "Unix settings"
 msgstr "Атрибуты UNIX"
 
@@ -1211,33 +1410,57 @@ msgstr "Атрибуты UNIX"
 msgid "UNIX"
 msgstr "Unix"
 
+#: plugins/personal/posix/class_posixAccount.inc:129
+#, fuzzy
+msgid "expired"
+msgstr "Экспорт"
+
+#: plugins/personal/posix/class_posixAccount.inc:131
+msgid "grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:134
+#, fuzzy
+msgid "active, password not changable"
+msgstr "Новый пароль"
+
+#: plugins/personal/posix/class_posixAccount.inc:136
+#, fuzzy
+msgid "active, password expired"
+msgstr "Срок действия пароля истекает"
+
 #: plugins/personal/posix/class_posixAccount.inc:138
-#: plugins/personal/posix/class_posixAccount.inc:987
+#, fuzzy
+msgid "active"
+msgstr "Личный"
+
+#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:1008
 msgid "Group of user"
 msgstr "Группа пользователя"
 
-#: plugins/personal/posix/class_posixAccount.inc:178
+#: plugins/personal/posix/class_posixAccount.inc:189
 msgid "unconfigured"
 msgstr "Не настроено"
 
-#: plugins/personal/posix/class_posixAccount.inc:196
-#: plugins/admin/systems/class_terminalService.inc:141
-#: plugins/admin/systems/class_workstationStartup.inc:690
-#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/personal/posix/class_posixAccount.inc:206
+#: plugins/admin/systems/class_terminalService.inc:194
+#: plugins/admin/systems/class_workstationStartup.inc:759
+#: plugins/admin/systems/class_workstationService.inc:182
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "автоматически"
 
-#: plugins/personal/posix/class_posixAccount.inc:235
+#: plugins/personal/posix/class_posixAccount.inc:254
 msgid "This account has no unix extensions."
 msgstr "В этой учетной записи нет расширений UNIX."
 
-#: plugins/personal/posix/class_posixAccount.inc:255
-#: plugins/personal/posix/class_posixAccount.inc:258
+#: plugins/personal/posix/class_posixAccount.inc:274
+#: plugins/personal/posix/class_posixAccount.inc:277
 msgid "Remove posix account"
 msgstr "Удалить учетную запись POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:256
+#: plugins/personal/posix/class_posixAccount.inc:275
 #, fuzzy
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
@@ -1246,7 +1469,7 @@ msgstr ""
 "В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
 "использование, сначала нужно удалить учетную запись Samba."
 
-#: plugins/personal/posix/class_posixAccount.inc:259
+#: plugins/personal/posix/class_posixAccount.inc:278
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1254,11 +1477,11 @@ msgstr ""
 "В этой учетной записи используются атрибуты POSIX. Вы можете отключить их "
 "использование, щелкнув ниже."
 
-#: plugins/personal/posix/class_posixAccount.inc:262
+#: plugins/personal/posix/class_posixAccount.inc:281
 msgid "Create posix account"
 msgstr "Создать учетную запись POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:263
+#: plugins/personal/posix/class_posixAccount.inc:282
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1266,254 +1489,291 @@ msgstr ""
 "В этой учетной записи не используются атрибуты POSIX. Вы можете использовать "
 "их, щелкнув ниже."
 
-#: plugins/personal/posix/class_posixAccount.inc:464
+#: plugins/personal/posix/class_posixAccount.inc:451
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr "Пароль нельзя изменить в течение %s дн. с последней смены (shadowMin)"
 
-#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/posix/class_posixAccount.inc:455
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Пароль должен быть изменен по истечении %s дн. (shadowMax)"
 
-#: plugins/personal/posix/class_posixAccount.inc:468
+#: plugins/personal/posix/class_posixAccount.inc:459
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 "Отключить учетную запись, если срок действия пароля истек и прошло %s дн. "
 "бездействия (shadowInactive)"
 
-#: plugins/personal/posix/class_posixAccount.inc:470
+#: plugins/personal/posix/class_posixAccount.inc:463
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 "Предупреждать пользователей за %s дн. до истечения срока действия пароля "
 "(shadowWarning)"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr "Январь"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr "Февраль"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr "Март"
 
-#: plugins/personal/posix/class_posixAccount.inc:494
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr "Апрель"
 
-#: plugins/personal/posix/class_posixAccount.inc:495
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr "Май"
 
-#: plugins/personal/posix/class_posixAccount.inc:495
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr "Июнь"
 
-#: plugins/personal/posix/class_posixAccount.inc:495
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr "Июль"
 
-#: plugins/personal/posix/class_posixAccount.inc:495
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr "Август"
 
-#: plugins/personal/posix/class_posixAccount.inc:495
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr "Сентябрь"
 
-#: plugins/personal/posix/class_posixAccount.inc:496
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr "Октябрь"
 
-#: plugins/personal/posix/class_posixAccount.inc:496
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr "Ноябрь"
 
-#: plugins/personal/posix/class_posixAccount.inc:496
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr "Декабрь"
 
-#: plugins/personal/posix/class_posixAccount.inc:578
-#: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:60
-#: ihtml/themes/altlinux/setup_step4.tpl:91
+#: plugins/personal/posix/class_posixAccount.inc:577
+#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "отключен"
 
-#: plugins/personal/posix/class_posixAccount.inc:578
+#: plugins/personal/posix/class_posixAccount.inc:577
 msgid "full access"
 msgstr "полный доступ"
 
-#: plugins/personal/posix/class_posixAccount.inc:579
+#: plugins/personal/posix/class_posixAccount.inc:578
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: plugins/personal/posix/class_posixAccount.inc:751
+#: plugins/personal/posix/class_posixAccount.inc:624
+#, fuzzy, php-format
+msgid "Removing of user/posix account with dn '%s' failed."
+msgstr "Удалить учетную запись POSIX"
+
+#: plugins/personal/posix/class_posixAccount.inc:772
 msgid "Failed: overriding lock"
 msgstr "Ошибка: замещение блокировки"
 
-#: plugins/personal/posix/class_posixAccount.inc:901
+#: plugins/personal/posix/class_posixAccount.inc:861
+#, fuzzy, php-format
+msgid "Saving of user/posix account with dn '%s' failed."
+msgstr "Аккаунт Proxy"
+
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "The required field 'Home directory' is not set."
 msgstr "Обязательное поле \"Домашний каталог\" не заполнено."
 
-#: plugins/personal/posix/class_posixAccount.inc:904
+#: plugins/personal/posix/class_posixAccount.inc:925
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr "Введите корректный путь в поле \"Домашний каталог\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:912
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "Value specified as 'UID' is not valid."
 msgstr "Значение поля \"UID\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:915
+#: plugins/personal/posix/class_posixAccount.inc:936
 msgid "Value specified as 'UID' is too small."
 msgstr "Значение 'UID' слишком маленькое."
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:940
+#: plugins/admin/groups/class_groupGeneric.inc:774
 msgid "Value specified as 'GID' is not valid."
 msgstr "Значение поля 'GID' некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/personal/posix/class_posixAccount.inc:943
+#: plugins/admin/groups/class_groupGeneric.inc:777
 msgid "Value specified as 'GID' is too small."
 msgstr "Значение 'GID' слишком маленькое."
 
-#: plugins/personal/posix/class_posixAccount.inc:930
+#: plugins/personal/posix/class_posixAccount.inc:951
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "Значение поля \"shadowMin\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:956
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "Значение поля \"shadowMax\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:940
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "Значение поля \"shadowWarning\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:943
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "Использование \"shadowWarning\" без \"shadowMax\" бессмысленно."
 
-#: plugins/personal/posix/class_posixAccount.inc:946
+#: plugins/personal/posix/class_posixAccount.inc:967
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "Значение поля \"shadowWarning\" должно быть меньше значения поля \"shadowMax"
 "\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:949
+#: plugins/personal/posix/class_posixAccount.inc:970
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "Значение поля \"shadowWarning\" должно быть больше значения поля \"shadowMin"
 "\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:954
+#: plugins/personal/posix/class_posixAccount.inc:975
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "Значение поля \"shadowInactive\" некорректно."
 
-#: plugins/personal/posix/class_posixAccount.inc:957
+#: plugins/personal/posix/class_posixAccount.inc:978
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "Использование \"shadowInactive\" без \"shadowMax\" бессмысленно."
 
-#: plugins/personal/posix/class_posixAccount.inc:962
+#: plugins/personal/posix/class_posixAccount.inc:983
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 "Значение поля \"shadowMin\" должно быть меньше значения поля \"shadowMax\"."
 
-#: plugins/personal/posix/class_posixAccount.inc:1089
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/personal/posix/class_posixAccount.inc:1110
+#: plugins/admin/groups/class_groupGeneric.inc:813
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
+#: plugins/personal/posix/class_posixAccount.inc:1249
+#, fuzzy
+msgid "POSIX account"
+msgstr "Аккаунт FTP"
+
+#: plugins/personal/posix/class_posixAccount.inc:1261
+#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
+#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
+#: html/getxls.php:299
+msgid "User ID"
+msgstr "Идентификатор пользователя"
+
+#: plugins/personal/posix/class_posixAccount.inc:1262
+#, fuzzy
+msgid "Group ID"
+msgstr "Группа"
+
+#: plugins/personal/posix/class_posixAccount.inc:1264
+#, fuzzy
+msgid "Force password change on login"
+msgstr "Сменить пароль"
+
+#: plugins/personal/posix/class_posixAccount.inc:1265
+#, fuzzy
+msgid "Shadow min"
+msgstr "Затенение"
+
+#: plugins/personal/posix/class_posixAccount.inc:1266
+#, fuzzy
+msgid "Shadow max"
+msgstr "Затенение"
+
+#: plugins/personal/posix/class_posixAccount.inc:1267
+#, fuzzy
+msgid "Shadow warning"
+msgstr "Затенение"
+
+#: plugins/personal/posix/class_posixAccount.inc:1268
+#, fuzzy
+msgid "Shadow inactive"
+msgstr "Затенение"
+
+#: plugins/personal/posix/class_posixAccount.inc:1269
+#, fuzzy
+msgid "Shadow expire"
+msgstr "Показать людей"
+
+#: plugins/personal/posix/class_posixAccount.inc:1270
+#, fuzzy
+msgid "System trust model"
+msgstr "Системные доверия"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -1523,130 +1783,138 @@ msgstr "Атрибуты UNIX"
 msgid "Samba home"
 msgstr "Домашний каталог Samba"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba2.tpl:37 plugins/personal/samba/samba3.tpl:44
 msgid "Script path"
 msgstr "Путь к сценариям"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:644
+#: plugins/personal/samba/samba2.tpl:45 plugins/personal/samba/samba3.tpl:52
+#: plugins/personal/samba/samba3.tpl:111
+#: plugins/personal/samba/class_sambaAccount.inc:622
 msgid "Profile path"
 msgstr "Путь к профилю"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
+#: plugins/personal/samba/samba2.tpl:59 plugins/personal/samba/samba3.tpl:288
 msgid "Access options"
 msgstr "Параметры доступа"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
+#: plugins/personal/samba/samba2.tpl:67 plugins/personal/samba/samba3.tpl:296
 msgid "Allow user to change password from client"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
+#: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
+#: plugins/personal/samba/class_sambaAccount.inc:1030
 msgid "Login from windows client requires no password"
 msgstr "Не спрашивать пароль при входе в систему из Windows"
 
-#: plugins/personal/samba/samba2.tpl:60
+#: plugins/personal/samba/samba2.tpl:77
 msgid "Temporary disable samba account"
 msgstr "Временно отключить учетную запись Samba"
 
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:27
+#: plugins/personal/samba/class_sambaAccount.inc:1044
 msgid "Domain"
 msgstr "Домен"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:66
 msgid "Terminal Server"
 msgstr "Терминальный сервер"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:1026
 msgid "Allow login on terminal server"
 msgstr "Разрешить вход на терминальный сервер"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/class_sambaAccount.inc:1027
 msgid "Inherit client config"
 msgstr "Унаследовать конфигурацию клиента"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:134
 msgid "Initial program"
 msgstr "Начальная программа"
 
-#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/samba3.tpl:142
 msgid "Working directory"
 msgstr "Рабочий каталог"
 
-#: plugins/personal/samba/samba3.tpl:153
+#: plugins/personal/samba/samba3.tpl:159
 msgid "Timeout settings (in minutes)"
 msgstr "Настройки таймаута (в минутах)"
 
-#: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:651
+#: plugins/personal/samba/samba3.tpl:169
+#: plugins/personal/samba/class_sambaAccount.inc:629
 msgid "Connection"
 msgstr "Подключение"
 
-#: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:652
+#: plugins/personal/samba/samba3.tpl:183
+#: plugins/personal/samba/class_sambaAccount.inc:630
 msgid "Disconnection"
 msgstr "Отключение"
 
-#: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:653
+#: plugins/personal/samba/samba3.tpl:197
+#: plugins/personal/samba/class_sambaAccount.inc:631
 msgid "IDLE"
 msgstr "Простой"
 
-#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/samba3.tpl:213
 msgid "Client devices"
 msgstr "Клиентские устройства"
 
-#: plugins/personal/samba/samba3.tpl:194
+#: plugins/personal/samba/samba3.tpl:220
 msgid "Connect client drives at logon"
 msgstr "Подключить клиентские устройства при входе"
 
-#: plugins/personal/samba/samba3.tpl:200
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Connect client printers at logon"
 msgstr "Подключить клиентские принтеры при входе"
 
-#: plugins/personal/samba/samba3.tpl:206
+#: plugins/personal/samba/samba3.tpl:236
 msgid "Default to main client printer"
 msgstr "Указать принтер по умолчанию"
 
-#: plugins/personal/samba/samba3.tpl:216
-#: plugins/personal/connectivity/pureftpd.tpl:68
+#: plugins/personal/samba/samba3.tpl:246
+#: plugins/personal/connectivity/pureftpd.tpl:93
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: plugins/personal/samba/samba3.tpl:220
+#: plugins/personal/samba/samba3.tpl:250
 msgid "Shadowing"
 msgstr "Затенение"
 
-#: plugins/personal/samba/samba3.tpl:229
+#: plugins/personal/samba/samba3.tpl:261
 msgid "On broken or timed out"
 msgstr "При обрыве или таймауте"
 
-#: plugins/personal/samba/samba3.tpl:237
+#: plugins/personal/samba/samba3.tpl:271
 msgid "Reconnect if disconnected"
 msgstr "В"
 
-#: plugins/personal/samba/samba3.tpl:264
+#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/class_sambaAccount.inc:1031
 #, fuzzy
 msgid "Lock samba account"
 msgstr "Удалить учетную запись Samba"
 
-#: plugins/personal/samba/samba3.tpl:279
+#: plugins/personal/samba/samba3.tpl:331
+#: plugins/personal/samba/class_sambaAccount.inc:1037
 msgid "Limit Logon Time"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:291
+#: plugins/personal/samba/samba3.tpl:351
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 msgid "Limit Logoff Time"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:304
+#: plugins/personal/samba/samba3.tpl:372
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:398
 msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
 #: plugins/personal/samba/main.inc:123
+#: plugins/personal/samba/class_sambaAccount.inc:1017
 msgid "Samba settings"
 msgstr "Настройки Samba"
 
@@ -1695,50 +1963,55 @@ msgstr ""
 "В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
 "атрибуты POSIX, включите сначала их использование."
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "input on, notify on"
 msgstr "входящие вкл, оповещение вкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "input on, notify off"
 msgstr "входящие вкл, оповещение выкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:458
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "input off, notify on"
 msgstr "входящие выкл, оповещение вкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:463
 msgid "input off, nofify off"
 msgstr "входящие выкл, оповещение выкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:461
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "disconnect"
 msgstr "отключиться"
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:466
 msgid "reset"
 msgstr "сброс"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:468
 msgid "from any client"
 msgstr "от любого клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:469
 msgid "from previous client only"
 msgstr "только от предыдущего клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:646
+#: plugins/personal/samba/class_sambaAccount.inc:605
+#, fuzzy, php-format
+msgid "Removing of user/samba account with dn '%s' failed."
+msgstr "Удалить учетную запись Samba"
+
+#: plugins/personal/samba/class_sambaAccount.inc:624
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Значение '%s' содержит недопустимые символы."
 
-#: plugins/personal/samba/class_sambaAccount.inc:656
+#: plugins/personal/samba/class_sambaAccount.inc:634
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr "Значение таймаута '%s' пустое или содержит недопустимые символы."
 
-#: plugins/personal/samba/class_sambaAccount.inc:662
+#: plugins/personal/samba/class_sambaAccount.inc:640
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1746,7 +2019,7 @@ msgstr ""
 "Менеджер пользователей Windows допускает подключение только восми клиентов. "
 "Вы указали больше чем восем."
 
-#: plugins/personal/samba/class_sambaAccount.inc:846
+#: plugins/personal/samba/class_sambaAccount.inc:824
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1754,7 +2027,7 @@ msgstr ""
 "Внимание: этот аккаунт имеет неправильный SID. Это нельзя исправить "
 "средствами GOsa."
 
-#: plugins/personal/samba/class_sambaAccount.inc:870
+#: plugins/personal/samba/class_sambaAccount.inc:848
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1762,6 +2035,50 @@ msgstr ""
 "Предупреждение: не удается идентифицировать основную группу, преобразование "
 "в группу Samba невозможно!"
 
+#: plugins/personal/samba/class_sambaAccount.inc:952
+#, fuzzy, php-format
+msgid "Saving of user/samba account with dn '%s' failed."
+msgstr "Моя учетная запись"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1029
+#, fuzzy
+msgid "Allow user to change password"
+msgstr "Разрешить пользователям менять пароль с клиента"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1034
+#, fuzzy
+msgid "Account expires"
+msgstr "Учетная запись"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1035
+#, fuzzy
+msgid "Password expires"
+msgstr "Срок действия пароля истекает"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1040
+#, fuzzy
+msgid "Generic home directory"
+msgstr "Домашний каталог"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1041
+msgid "Generic samba home drive"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1042
+#, fuzzy
+msgid "Generic script path"
+msgstr "Путь к сценариям"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1043
+#, fuzzy
+msgid "Generic profile path"
+msgstr "Путь к профилю"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1045
+#, fuzzy
+msgid "Allow connection from"
+msgstr "Разрешить подключения только от этой рабочей станции"
+
 #: plugins/personal/generic/class_user.inc:256
 msgid "female"
 msgstr "женский"
@@ -1770,81 +2087,96 @@ msgstr "женский"
 msgid "male"
 msgstr "мужской"
 
-#: plugins/personal/generic/class_user.inc:270
+#: plugins/personal/generic/class_user.inc:272
 msgid "This account has no valid GOsa extensions."
 msgstr "Для этой учетной записи нет корректных расширений GOsa."
 
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:330
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 "Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
 "прервана."
 
-#: plugins/personal/generic/class_user.inc:420
+#: plugins/personal/generic/class_user.inc:428
 msgid "Please enter a valid serial number"
 msgstr "Введите корректный серийный номер"
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:468
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:468
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:468
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:461
+#: plugins/personal/generic/class_user.inc:472
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/class_user.inc:879
+#: plugins/personal/generic/class_user.inc:563
+#, fuzzy, php-format
+msgid "Removing of user/generic account with dn '%s' failed."
+msgstr "Удалить учетную запись POSIX"
+
+#: plugins/personal/generic/class_user.inc:631
+#, fuzzy, php-format
+msgid "You are not allowed to move this object to '%s'."
+msgstr "У вас недостаточно прав для удаления этого группового объекта!"
+
+#: plugins/personal/generic/class_user.inc:874
+#, fuzzy, php-format
+msgid "Saving of user/generic account with dn '%s' failed."
+msgstr "Аккаунт Proxy"
+
+#: plugins/personal/generic/class_user.inc:921
 msgid "Kerberos database communication failed"
 msgstr "Ошибка соединения с базой данных Kerberos"
 
-#: plugins/personal/generic/class_user.inc:896
+#: plugins/personal/generic/class_user.inc:938
 msgid "Can't remove user from kerberos database."
 msgstr "Не удается удалить пользователя из базы данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:907
+#: plugins/personal/generic/class_user.inc:949
 msgid "Can't add user to kerberos database."
 msgstr "Не удается добавить пользователя в базу данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:948
+#: plugins/personal/generic/class_user.inc:990
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/personal/generic/class_user.inc:953
+#: plugins/personal/generic/class_user.inc:993
 #, fuzzy
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:999
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:520
 msgid "The required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:968
+#: plugins/personal/generic/class_user.inc:1008
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:1014
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:523
 msgid "The required field 'Given name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:977
+#: plugins/personal/generic/class_user.inc:1017
 msgid "The required field 'Login' is not set."
 msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:984
+#: plugins/personal/generic/class_user.inc:1024
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1852,7 +2184,7 @@ msgstr ""
 "Пользователь с такой комбинацией имени и личного имени в базе данных уже "
 "существует."
 
-#: plugins/personal/generic/class_user.inc:991
+#: plugins/personal/generic/class_user.inc:1031
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1860,71 +2192,352 @@ msgstr ""
 "Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
 "Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/personal/generic/class_user.inc:994
+#: plugins/personal/generic/class_user.inc:1034
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
 
-#: plugins/personal/generic/class_user.inc:997
-#: plugins/personal/generic/class_user.inc:1022
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1062
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:212
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/personal/generic/class_user.inc:1000
-#: plugins/personal/generic/class_user.inc:1019
+#: plugins/personal/generic/class_user.inc:1040
+#: plugins/personal/generic/class_user.inc:1059
 #: 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:1005
+#: plugins/personal/generic/class_user.inc:1045
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:215
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1008
+#: plugins/personal/generic/class_user.inc:1048
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:218
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1051
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1054
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
 
-#: plugins/personal/generic/class_user.inc:1141
+#: plugins/personal/generic/class_user.inc:1184
 #, fuzzy
 msgid "Could not open specified certificate!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Личная информация"
+#: plugins/personal/generic/class_user.inc:1330
+#: plugins/personal/generic/generic.tpl:442
+msgid "Unit"
+msgstr "Подразделение"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
-#: plugins/personal/generic/generic_picture.tpl:5
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/generic.tpl:467
+msgid "House identifier"
+msgstr "Номер дома"
+
+#: plugins/personal/generic/class_user.inc:1332
+#: plugins/personal/generic/generic.tpl:384
+msgid "Vocation"
+msgstr "Специальность"
+
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:511
+msgid "Last delivery"
+msgstr "Последняя доставка"
+
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:433
+msgid "Person locality"
+msgstr "Местоположение сотрудника"
+
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:392
+msgid "Unit description"
+msgstr "Описание подразделения"
+
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:401
+msgid "Subject area"
+msgstr "Область деятельности"
+
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/generic.tpl:410
+msgid "Functional title"
+msgstr "Должность"
+
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/generic.tpl:520
+msgid "Public visible"
+msgstr "Видимый всем"
+
+#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/generic.tpl:451
+msgid "Street"
+msgstr "Улица"
+
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/generic/generic.tpl:419
+msgid "Role"
+msgstr "Роль"
+
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/generic.tpl:459
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+msgid "Postal code"
+msgstr "Почтовый индекс"
+
+#: plugins/personal/generic/class_user.inc:1346
+#, fuzzy
+msgid "Generic user settings"
+msgstr "Общая информация о пользователе"
+
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/addons/notifications/class_msgplug.inc:35
+#: plugins/admin/users/class_userManagement.inc:28
+#: plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: include/class_acl.inc:164 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
+msgid "Users"
+msgstr "Пользователи"
+
+#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/generic.tpl:143
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Ветка"
+
+#: plugins/personal/generic/class_user.inc:1356
+#, fuzzy
+msgid "User password"
+msgstr "Новый пароль"
+
+#: plugins/personal/generic/class_user.inc:1357 html/getxls.php:236
+#, fuzzy
+msgid "Surename"
+msgstr "Имя сервера"
+
+#: plugins/personal/generic/class_user.inc:1358
+#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
+#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
+msgid "Given name"
+msgstr "Имя"
+
+#: plugins/personal/generic/class_user.inc:1359
+#, fuzzy
+msgid "User identification"
+msgstr "Информация"
+
+#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/generic.tpl:73
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
+msgid "Personal title"
+msgstr "Обращение"
+
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/generic.tpl:83
+msgid "Academic title"
+msgstr "Академическое звание"
+
+#: plugins/personal/generic/class_user.inc:1362 html/getxls.php:174
+msgid "Home postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1363
+#, fuzzy
+msgid "Home phone number"
+msgstr "Телефонные номера"
+
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/generic.tpl:183
+msgid "Homepage"
+msgstr "Домашняя страница"
+
+#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
+msgid "Organization"
+msgstr "Организация"
+
+#: plugins/personal/generic/class_user.inc:1366
+#: plugins/personal/generic/generic.tpl:258
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
+#: plugins/addons/addressbook/address_edit.tpl:138
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/applications/class_divListApplication.inc:51
+#: plugins/admin/ogroups/class_ogroupManagement.inc:385
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
+#: plugins/gofon/macro/class_divListMacros.inc:52
+#: plugins/generic/references/class_reference.inc:38
+msgid "Department"
+msgstr "Подразделение"
+
+#: plugins/personal/generic/class_user.inc:1367
+#: plugins/personal/generic/generic.tpl:93
+msgid "Date of birth"
+msgstr "Дата рождения"
+
+#: plugins/personal/generic/class_user.inc:1368
+#, fuzzy
+msgid "Gender"
+msgstr "Отправитель"
+
+#: plugins/personal/generic/class_user.inc:1369
+#, fuzzy
+msgid "Preferred language"
+msgstr "Язык по умолчанию"
+
+#: plugins/personal/generic/class_user.inc:1370
+#, fuzzy
+msgid "Department number"
+msgstr "Управление подразделениями"
+
+#: plugins/personal/generic/class_user.inc:1371
+#, fuzzy
+msgid "Employee number"
+msgstr "Форма трудоустройства"
+
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/generic/generic.tpl:282
+msgid "Employee type"
+msgstr "Форма трудоустройства"
+
+#: plugins/personal/generic/class_user.inc:1373
+#: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/godfs/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:798
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
+msgid "Location"
+msgstr "Местоположение"
+
+#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
+msgid "State"
+msgstr "Адм. единица"
+
+#: plugins/personal/generic/class_user.inc:1375
+#: plugins/personal/generic/paste_generic.tpl:22
+#, fuzzy
+msgid "User picture"
+msgstr "Изображение"
+
+#: plugins/personal/generic/class_user.inc:1376
+#, fuzzy
+msgid "Room number"
+msgstr "Телефонные номера"
+
+#: plugins/personal/generic/class_user.inc:1377
+#, fuzzy
+msgid "Telefon number"
+msgstr "Телефонные номера"
+
+#: plugins/personal/generic/class_user.inc:1378
+#, fuzzy
+msgid "Mobile number"
+msgstr "Домашний телефон"
+
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
+#, fuzzy
+msgid "Pager number"
+msgstr "Телефонные номера"
+
+#: plugins/personal/generic/class_user.inc:1380
+#, fuzzy
+msgid "User certificates"
+msgstr "Стандартный сертификат"
+
+#: plugins/personal/generic/class_user.inc:1382 html/getxls.php:174
+#: html/getxls.php:236
+#, fuzzy
+msgid "Postal address"
+msgstr "Почтовый индекс"
+
+#: plugins/personal/generic/class_user.inc:1383
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
+#, fuzzy
+msgid "Fax number"
+msgstr "Терминал"
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Личная информация"
+
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:22
+#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:29
+#: plugins/personal/generic/generic.tpl:40
 msgid "Change picture"
 msgstr "Сменить изображение"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
@@ -1932,12 +2545,12 @@ msgstr "Сменить изображение"
 msgid "Last name"
 msgstr "Список"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:54
 #, fuzzy
 msgid "Template name"
 msgstr "Шаблон"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:61
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
@@ -1945,174 +2558,119 @@ msgstr "Шаблон"
 msgid "First name"
 msgstr "Список"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:65
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Имя пользователя"
 
-#: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:22
-msgid "Personal title"
-msgstr "Обращение"
-
-#: plugins/personal/generic/generic.tpl:75
-msgid "Academic title"
-msgstr "Академическое звание"
-
-#: plugins/personal/generic/generic.tpl:83
-msgid "Date of birth"
-msgstr "Дата рождения"
-
-#: plugins/personal/generic/generic.tpl:100
-#: ihtml/themes/altlinux/sizelimit.tpl:14
+#: plugins/personal/generic/generic.tpl:111
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "Установить"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:118 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Пол"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:130
 #, fuzzy
 msgid "Preferred langage"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:319
-#: plugins/admin/groups/class_groupManagement.inc:467
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:774
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:483
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:306
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:778
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_ogroupManagement.inc:460
-#: plugins/admin/fai/class_faiManagement.inc:679
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
-msgid "Base"
-msgstr "Ветка"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:148
 msgid "Choose subtree to place user in"
 msgstr "Выберите ветку для пользователя"
 
-#: plugins/personal/generic/generic.tpl:134
-#: plugins/admin/groups/generic.tpl:26
-#: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/workstation.tpl:32
-#: plugins/admin/systems/printer.tpl:25
+#: plugins/personal/generic/generic.tpl:153
+#: plugins/gofax/blocklists/generic.tpl:21
+#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
+#: plugins/admin/groups/generic.tpl:29
+#: plugins/admin/applications/generic.tpl:39
+#: plugins/admin/applications/generic.tpl:41
+#: plugins/admin/departments/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:36
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
+#: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
+#: 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/workstation.tpl:29
+#: plugins/admin/systems/workstation.tpl:31
 #: plugins/admin/systems/wingeneric.tpl:18
-#: plugins/admin/systems/component.tpl:18 plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/systems/component.tpl:19
+#: plugins/admin/systems/component.tpl:21 plugins/admin/ogroups/generic.tpl:27
+#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/mimetypes/generic.tpl:45
+#: plugins/admin/mimetypes/generic.tpl:47 plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
+#: plugins/gofon/conference/generic.tpl:41
 #, fuzzy
 msgid "Select a base"
 msgstr "Выберите, чтобы просмотреть серверы"
 
-#: plugins/personal/generic/generic.tpl:147
-#: plugins/personal/generic/generic.tpl:291
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
-#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Адрес"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Личный телефон"
 
-#: plugins/personal/generic/generic.tpl:155
-msgid "Homepage"
-msgstr "Домашняя страница"
-
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/generic.tpl:174
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Сертификаты"
 
-#: plugins/personal/generic/generic.tpl:176
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:181
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Изменить свойства"
 
-#: plugins/personal/generic/generic.tpl:197
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/generic.tpl:209 html/getxls.php:236
-msgid "Organization"
-msgstr "Организация"
-
-#: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:330
-#: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:532
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/applications/class_applicationManagement.inc:524
-#: plugins/admin/systems/class_systemManagement.inc:798
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
-#: plugins/admin/ogroups/class_ogroupManagement.inc:594
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
-#: plugins/generic/references/class_reference.inc:38
-msgid "Department"
-msgstr "Подразделение"
-
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/generic.tpl:223
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/generic.tpl:229
-msgid "Employee type"
-msgstr "Форма трудоустройства"
-
-#: plugins/personal/generic/generic.tpl:245
-#: plugins/personal/generic/generic.tpl:384
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/generic.tpl:257
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2120,73 +2678,10 @@ msgstr "Мобильный"
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/generic.tpl:283
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/generic.tpl:51
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
-msgid "Location"
-msgstr "Местоположение"
-
-#: plugins/personal/generic/generic.tpl:287
-#: plugins/admin/departments/generic.tpl:47 html/getxls.php:174
-#: html/getxls.php:236
-msgid "State"
-msgstr "Адм. единица"
-
-#: plugins/personal/generic/generic.tpl:305
-msgid "Vocation"
-msgstr "Специальность"
-
-#: plugins/personal/generic/generic.tpl:309
-msgid "Unit description"
-msgstr "Описание подразделения"
-
-#: plugins/personal/generic/generic.tpl:317
-msgid "Subject area"
-msgstr "Область деятельности"
-
-#: plugins/personal/generic/generic.tpl:325
-msgid "Functional title"
-msgstr "Должность"
-
-#: plugins/personal/generic/generic.tpl:332
-msgid "Role"
-msgstr "Роль"
-
-#: plugins/personal/generic/generic.tpl:344
-msgid "Person locality"
-msgstr "Местоположение сотрудника"
-
-#: plugins/personal/generic/generic.tpl:352
-msgid "Unit"
-msgstr "Подразделение"
-
-#: plugins/personal/generic/generic.tpl:359
-msgid "Street"
-msgstr "Улица"
-
-#: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_edit.tpl:158
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
-msgid "Postal code"
-msgstr "Почтовый индекс"
-
-#: plugins/personal/generic/generic.tpl:371
-msgid "House identifier"
-msgstr "Номер дома"
-
-#: plugins/personal/generic/generic.tpl:393
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Воспользуйтесь закладкой \"Телефон\""
 
-#: plugins/personal/generic/generic.tpl:406
-msgid "Last delivery"
-msgstr "Последняя доставка"
-
-#: plugins/personal/generic/generic.tpl:413
-msgid "Public visible"
-msgstr "Видимый всем"
-
 #: plugins/personal/generic/password.tpl:2
 msgid ""
 "You have changed the method your password is stored in the ldap database. "
@@ -2202,11 +2697,45 @@ msgstr ""
 msgid "Remove picture"
 msgstr "Удалить изображение"
 
-#: plugins/personal/generic/main.inc:107
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/personal/generic/generic_certs.tpl:91
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/systems/servdns.tpl:21
+#: plugins/admin/systems/servkolab.tpl:203
+#: plugins/admin/systems/goNtpServer.tpl:22
+#: plugins/admin/systems/servnfs.tpl:120
+#: plugins/admin/systems/servRepository.tpl:64
+#: plugins/admin/systems/goFonServer.tpl:24
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/servdnseditzone.tpl:119
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/goKrbServer.tpl:19
+#: plugins/admin/systems/goLdapServer.tpl:7
+#: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
+#: plugins/admin/systems/goImapServer.tpl:94
+#: plugins/admin/systems/goSyslogServer.tpl:6
+#: plugins/admin/systems/goGlpiServer.tpl:24
+#: plugins/admin/systems/goCupsServer.tpl:6
+#: plugins/admin/systems/goTerminalServer.tpl:17
+#: plugins/admin/systems/goFaxServer.tpl:16
+#: plugins/admin/systems/goLogDBServer.tpl:16
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: include/class_MultiSelectWindow.inc:78
+#: ihtml/themes/default/copyPasteDialog.tpl:14
+msgid "Save"
+msgstr "Сохранить"
+
+#: plugins/personal/generic/main.inc:97
 msgid "You are not allowed to set your password!"
 msgstr "Вам не разрешено менять пароль."
 
-#: plugins/personal/generic/main.inc:189
+#: plugins/personal/generic/main.inc:177
 msgid "Generic user information"
 msgstr "Общая информация о пользователе"
 
@@ -2214,35 +2743,36 @@ msgstr "Общая информация о пользователе"
 msgid "Standard certificate"
 msgstr "Стандартный сертификат"
 
-#: plugins/personal/generic/generic_certs.tpl:17
-#: plugins/personal/generic/generic_certs.tpl:37
-#: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:206
-#: plugins/personal/environment/environment.tpl:122
+#: plugins/personal/generic/generic_certs.tpl:21
+#: plugins/personal/generic/generic_certs.tpl:45
+#: plugins/personal/generic/generic_certs.tpl:69
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#: plugins/personal/environment/environment.tpl:152
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:538
+#: plugins/admin/groups/class_groupMail.inc:544
 #: plugins/admin/applications/class_applicationParameters.inc:100
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/printer.tpl:53 plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/workstationStartup.tpl:101
+#: plugins/admin/systems/workstationStartup.tpl:144
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goMailServer.tpl:57
+#: plugins/admin/systems/goMailServer.tpl:80
 #: plugins/admin/fai/faiPackage.tpl:72
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
-#: ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr "Удалить"
 
-#: plugins/personal/generic/generic_certs.tpl:28
+#: plugins/personal/generic/generic_certs.tpl:33
 msgid "S/MIME certificate"
 msgstr "Сертификат S/MIME"
 
-#: plugins/personal/generic/generic_certs.tpl:48
+#: plugins/personal/generic/generic_certs.tpl:57
 msgid "PKCS12 certificate"
 msgstr "Сертификат PKCS12"
 
-#: plugins/personal/generic/generic_certs.tpl:65
+#: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
@@ -2251,11 +2781,6 @@ msgstr "Серийный номер сертификата"
 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"
@@ -2279,24 +2804,24 @@ msgstr "Пропускная способность"
 msgid "Upload bandwidth"
 msgstr "Пропускная способность (на сервер)"
 
-#: plugins/personal/connectivity/pureftpd.tpl:20
 #: plugins/personal/connectivity/pureftpd.tpl:24
+#: plugins/personal/connectivity/pureftpd.tpl:32
 msgid "kb/s"
 msgstr "Кб/с"
 
-#: plugins/personal/connectivity/pureftpd.tpl:23
+#: plugins/personal/connectivity/pureftpd.tpl:27
 msgid "Download bandwidth"
 msgstr "Пропускная способность (с сервера)"
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
+#: plugins/personal/connectivity/pureftpd.tpl:43
 msgid "Quota"
 msgstr "Квота"
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
+#: plugins/personal/connectivity/pureftpd.tpl:47
 msgid "Files"
 msgstr "Файлы"
 
-#: plugins/personal/connectivity/pureftpd.tpl:43
+#: plugins/personal/connectivity/pureftpd.tpl:55
 #: plugins/addons/mailqueue/contents.tpl:54
 #: plugins/admin/systems/glpi_devices.tpl:293
 #: plugins/admin/systems/glpi_devices.tpl:420
@@ -2304,41 +2829,43 @@ msgstr "Файлы"
 msgid "Size"
 msgstr "Размер"
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Ratio"
 msgstr "Отношение"
 
-#: plugins/personal/connectivity/pureftpd.tpl:58
+#: plugins/personal/connectivity/pureftpd.tpl:75
 msgid "Uploaded / downloaded files"
 msgstr "Загрузка на сервер / с сервера"
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
+#: plugins/personal/connectivity/pureftpd.tpl:98
 msgid "Check to disable FTP Access"
 msgstr "Отметьте, чтобы отключить доступ к FTP"
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
+#: plugins/personal/connectivity/pureftpd.tpl:100
 msgid "Temporary disable FTP access"
 msgstr "Временно отключить доступ к FTP"
 
-#: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/proxy.tpl:17
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
 msgid "Proxy account"
 msgstr "Аккаунт Proxy"
 
-#: plugins/personal/connectivity/proxy.tpl:18
+#: plugins/personal/connectivity/proxy.tpl:28
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
 "Фильтровать нежелательное содержимое (например, порнографическое или "
 "связанное с насилием)"
 
-#: plugins/personal/connectivity/proxy.tpl:24
+#: plugins/personal/connectivity/proxy.tpl:38
 msgid "Limit proxy access to working time"
 msgstr "Ограничить доступ к прокси рабочим временем"
 
-#: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/proxy.tpl:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:300
 msgid "Restrict proxy usage by quota"
 msgstr "Ограничить квотой использование прокси"
 
-#: plugins/personal/connectivity/proxy.tpl:86
+#: plugins/personal/connectivity/proxy.tpl:93
 msgid "per"
 msgstr "per"
 
@@ -2346,11 +2873,31 @@ msgstr "per"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#, fuzzy, php-format
+msgid "Removing of user/PHPgw account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:118
+#, fuzzy, php-format
+msgid "Saving of user/PHPgw account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:135
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:136
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Настройки Samba"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Учетная запись Groupware"
 
-#: plugins/personal/connectivity/kolab.tpl:1
+#: plugins/personal/connectivity/kolab.tpl:3
+#: plugins/personal/connectivity/kolab.tpl:35
 #, fuzzy
 msgid "Kolab account"
 msgstr "Моя учетная запись"
@@ -2361,50 +2908,54 @@ msgid ""
 "you add a mail account."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:10
+#: plugins/personal/connectivity/kolab.tpl:41
+#: plugins/personal/connectivity/class_kolabAccount.inc:449
 #, fuzzy
 msgid "Delegations"
 msgstr "Назначение"
 
-#: plugins/personal/connectivity/kolab.tpl:23
+#: plugins/personal/connectivity/kolab.tpl:59
 #, fuzzy
 msgid "Mail size"
 msgstr "Размер квоты"
 
-#: plugins/personal/connectivity/kolab.tpl:24
+#: plugins/personal/connectivity/kolab.tpl:62
 msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:32
+#: plugins/personal/connectivity/kolab.tpl:71
 #, fuzzy
 msgid "Free Busy information"
 msgstr "Общая информация о пользователе"
 
-#: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/kolab.tpl:74
 #: plugins/admin/systems/servRepositorySetup.tpl:24
 msgid "URL"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:39
+#: plugins/personal/connectivity/kolab.tpl:82
 msgid "Future"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
+#: plugins/personal/connectivity/kolab.tpl:86
+#: plugins/personal/connectivity/oxchange.tpl:39
+#: plugins/personal/connectivity/oxchange.tpl:49
 #, fuzzy
 msgid "days"
 msgstr "день"
 
-#: plugins/personal/connectivity/kolab.tpl:45
+#: plugins/personal/connectivity/kolab.tpl:93
+#: plugins/personal/connectivity/class_kolabAccount.inc:450
 msgid "Invitation policy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:436
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:105
+#: plugins/personal/connectivity/class_kolabAccount.inc:133
 #, fuzzy
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
@@ -2412,123 +2963,224 @@ msgstr ""
 "Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
 "кому должны пересылаться сообщения."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:113
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
 #, fuzzy
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
+#: plugins/personal/connectivity/class_kolabAccount.inc:166
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
+#: plugins/personal/connectivity/class_kolabAccount.inc:167
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:142
+#: plugins/personal/connectivity/class_kolabAccount.inc:168
 #, fuzzy
 msgid "Reject if conflicts"
 msgstr "В"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:143
+#: plugins/personal/connectivity/class_kolabAccount.inc:169
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:144
+#: plugins/personal/connectivity/class_kolabAccount.inc:170
 #, fuzzy
 msgid "Manual"
 msgstr "Январь"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:180
+#: plugins/personal/connectivity/class_kolabAccount.inc:218
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:233
+#: plugins/personal/connectivity/class_kolabAccount.inc:279
+#, fuzzy, php-format
+msgid "Removing of user/kolab account with dn '%s' failed."
+msgstr "Удалить учетную запись Samba"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:290
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:238
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 #, fuzzy
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:252
+#: plugins/personal/connectivity/class_kolabAccount.inc:309
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:260
+#: plugins/personal/connectivity/class_kolabAccount.inc:317
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:401
+#, fuzzy, php-format
+msgid "Saving of user/kolab account with dn '%s' failed."
+msgstr "Моя учетная запись"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:437
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Моя учетная запись"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:446
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:448
+#, fuzzy
+msgid "Free busy information"
+msgstr "Общая информация о пользователе"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#, fuzzy, php-format
+msgid "Removing of user/webDAV account with dn '%s' failed."
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:115
+#, fuzzy, php-format
+msgid "Saving of user/webDAV account with dn '%s' failed."
+msgstr "Учетная запись WebDAV"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: 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:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:99
+#, fuzzy, php-format
+msgid "Removing of user/pureftpd account with dn '%s' failed."
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 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:149
+#, fuzzy
+msgid "Value specified as 'Quota files' is not valid."
+msgstr "Значение поля \"Размер\" некорректно."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
+#, fuzzy
+msgid "Value specified as 'Quota 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:155
+#, fuzzy
+msgid "Value specified as 'Upload ratio' is not valid."
+msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Учетная запись WebDAV"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:158
+#, fuzzy
+msgid "Value specified as 'Download ratio' is not valid."
+msgstr "Значение поля \"Пропускная способность (с сервера)\" некорректно."
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:184
+#, fuzzy, php-format
+msgid "Saving of user/pureftpd account with dn '%s' failed."
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Ftp"
+msgstr "Тип"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Создать настройки факса"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:213
+#, fuzzy
+msgid "Quota files"
+msgstr "Размер квоты"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:214
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Загрузка процессора"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:215
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Размер квоты"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:216
+#, fuzzy
+msgid "Download ratio"
+msgstr "Системная информация"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:217
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Пропускная способность (на сервер)"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:218
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Пропускная способность (с сервера)"
 
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr ""
 
 #: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
+#: plugins/personal/connectivity/oxchange.tpl:18
 #, fuzzy
 msgid "Open-Xchange account"
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/personal/connectivity/oxchange.tpl:13
+#: plugins/personal/connectivity/oxchange.tpl:29
 #, fuzzy
 msgid "Remember"
 msgstr "Декабрь"
 
-#: plugins/personal/connectivity/oxchange.tpl:17
+#: plugins/personal/connectivity/oxchange.tpl:33
 msgid "Appointment Days"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
+#: plugins/personal/connectivity/oxchange.tpl:42
 msgid "Task Days"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:33
+#: plugins/personal/connectivity/oxchange.tpl:61
 #, fuzzy
 msgid "User Information"
 msgstr "Информация"
 
-#: plugins/personal/connectivity/oxchange.tpl:37
+#: plugins/personal/connectivity/oxchange.tpl:65
 msgid "User Timezone"
 msgstr ""
 
@@ -2536,57 +3188,71 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#, fuzzy, php-format
-msgid ""
-"This account has %s features disabled. Posix features are needed for "
-"openXchange accounts, enable them first."
-msgstr ""
-"В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
-"атрибуты POSIX, включите сначала их использование."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-#, fuzzy
-msgid "OpenXchange"
-msgstr "Удалить телефонный аккаунт"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-#, fuzzy, php-format
-msgid ""
-"This account has %s features disabled. Mail features are needed for "
-"openXchange accounts, enable them first."
-msgstr ""
-"В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
-"атрибуты POSIX, включите сначала их использование."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:701
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:709
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:817
 #, fuzzy
 msgid "Couldn't connect to postgresql database!"
 msgstr "Невозможно подключиться к серверу базы данных!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:705
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:802
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:713
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:821
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:709
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:806
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:717
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:825
 #, fuzzy
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "Невозможно выполнить запрос к базе данных журналов!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:785
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
+#, fuzzy, php-format
+msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:805
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:838
+#, fuzzy, php-format
+msgid "Saving of user/oxchange account with dn '%s' failed."
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:845
+#, fuzzy, php-format
+msgid "Creating of user/oxchange account with dn '%s' failed."
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:885
+#, fuzzy
+msgid "Open xchange"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:886
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:895
+msgid "OXAppointmentDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:896
+msgid "OXTaskDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:897
+msgid "OXTimeZone"
+msgstr ""
+
 #: plugins/personal/connectivity/intranet.tpl:3
 #, fuzzy
 msgid "Intranet account"
@@ -2596,87 +3262,166 @@ msgstr "Создать телефонный аккаунт"
 msgid "This account has no connectivity extensions."
 msgstr "В этой учетной записи нет атрибутов для подключения."
 
+#: plugins/personal/connectivity/class_connectivity.inc:177
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Подключение"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:286
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Прокси-сервер"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/admin/systems/goMailServer.tpl:18
+#: plugins/admin/systems/goMailServer.tpl:26
+#: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:304
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
+#: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "час"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "day"
 msgstr "день"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "week"
 msgstr "неделя"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "month"
 msgstr "месяц"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:150
+#, fuzzy, php-format
+msgid "Removing of user/proxy account with dn '%s' failed."
+msgstr "Удалить учетную запись POSIX"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:168
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 #, fuzzy
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_proxyAccount.inc:268
+#, fuzzy, php-format
+msgid "Saving of user/proxy account with dn '%s' failed."
+msgstr "Аккаунт Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
 #, fuzzy
-msgid "PPTP account"
-msgstr "Ð\90ккаÑ\83нÑ\82 FTP"
+msgid "gosaProxyID"
+msgstr "Ð\9fÑ\80окÑ\81и-Ñ\81еÑ\80веÑ\80"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: plugins/personal/connectivity/class_proxyAccount.inc:298
+msgid "Filter unwanted content"
 msgstr ""
 
-#: plugins/personal/connectivity/glpi.tpl:1
+#: plugins/personal/connectivity/class_proxyAccount.inc:299
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
 #, fuzzy
-msgid "GLPI account"
-msgstr "Ð\90ккаÑ\83нÑ\82 FTP"
+msgid "Limit proxy access"
+msgstr "Ð\9eгÑ\80аниÑ\87иÑ\82Ñ\8c доÑ\81Ñ\82Ñ\83п к пÑ\80окÑ\81и Ñ\80абоÑ\87им вÑ\80еменем"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:26
-msgid "PPTP"
-msgstr ""
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#, fuzzy
+msgid "Limit quota"
+msgstr "Путь к профилю"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Параметры приложения"
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:302
 #, fuzzy
 msgid "Opengroupware"
 msgstr "Учетная запись Groupware"
 
 #: plugins/personal/connectivity/opengw.tpl:8
+#: plugins/personal/connectivity/class_opengwAccount.inc:312
 #, fuzzy
 msgid "Location team"
 msgstr "Местоположение"
 
 #: plugins/personal/connectivity/opengw.tpl:21
+#: plugins/personal/connectivity/class_opengwAccount.inc:313
 #, fuzzy
 msgid "Template user"
 msgstr "Шаблон"
 
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/personal/connectivity/opengw.tpl:33
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/admin/systems/class_servGeneric.inc:44
+#: plugins/admin/systems/class_workstationGeneric.inc:103
+#: plugins/admin/ogroups/class_termgroup.inc:46
 msgid "Locked"
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:49
+#: plugins/personal/connectivity/opengw.tpl:48
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
 msgid "Teams"
 msgstr ""
 
+#: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
+#, fuzzy
+msgid "PPTP account"
+msgstr "Аккаунт FTP"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:169
+msgid "Intranet"
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:100
+#, fuzzy, php-format
+msgid "Removing of user/intranet account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:158
+#, fuzzy, php-format
+msgid "Saving of user/intranet account with dn '%s' failed."
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:176
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
+msgstr "Аккаунт FTP"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:150
+msgid "PPTP"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:85
+#, fuzzy, php-format
+msgid "Removing of user/PPTP account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:132
+#, fuzzy, php-format
+msgid "Saving of user/PPTP account with dn '%s' failed."
+msgstr "Аккаунт FTP"
+
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
 #, fuzzy
 msgid "PHPscheduleit account"
@@ -2687,175 +3432,231 @@ msgstr "Учетная запись Groupware"
 msgid "PHPscheduleit"
 msgstr "Учетная запись Groupware"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
+#, fuzzy, php-format
+msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
+msgstr "Учетная запись Groupware"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#, fuzzy, php-format
+msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
+msgstr "Учетная запись Groupware"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:143
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "Учетная запись Groupware"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "Учетная запись Groupware"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
 msgid "Opengroupware account"
 msgstr "Учетная запись Groupware"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:136
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:141
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:149
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:303
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Учетная запись Groupware"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:14
+#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:191
 #, fuzzy
 msgid "Environment managment settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/environment/environment.tpl:11
+#: plugins/personal/environment/environment.tpl:17
 #, fuzzy
 msgid "Profile managment"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/environment/environment.tpl:18
+#: plugins/personal/environment/environment.tpl:26
 #, fuzzy
 msgid "Use profile managment"
 msgstr "Управление системами"
 
-#: plugins/personal/environment/environment.tpl:25
+#: plugins/personal/environment/environment.tpl:33
 #, fuzzy
 msgid "Profile server managment"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/environment/environment.tpl:28
+#: plugins/personal/environment/environment.tpl:36
 #, fuzzy
 msgid "Profil path"
 msgstr "Путь к профилю"
 
-#: plugins/personal/environment/environment.tpl:40
+#: plugins/personal/environment/environment.tpl:49
 #, fuzzy
 msgid "Profil quota"
 msgstr "Путь к профилю"
 
-#: plugins/personal/environment/environment.tpl:54
+#: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/class_environment.inc:1159
 msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:63
+#: plugins/personal/environment/environment.tpl:75
 #, fuzzy
 msgid "Kiosk profile settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/environment.tpl:78
+#: plugins/personal/environment/class_environment.inc:1165
 msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:72
+#: plugins/personal/environment/environment.tpl:88
 #, fuzzy
 msgid "Manage"
 msgstr "Название"
 
-#: plugins/personal/environment/environment.tpl:82
+#: plugins/personal/environment/environment.tpl:98
+#: plugins/personal/environment/class_environment.inc:1158
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:87
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/personal/environment/class_environment.inc:1164
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Разрешение"
 
-#: plugins/personal/environment/environment.tpl:106
+#: plugins/personal/environment/environment.tpl:126
+#: plugins/personal/environment/class_environment.inc:1170
 #: plugins/admin/systems/servservice.tpl:11
-#: plugins/admin/systems/workstationStartup.tpl:86
+#: plugins/admin/systems/class_workstationStartup.inc:1096
+#: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/goShareServer.tpl:1
+#: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 #, fuzzy
 msgid "Shares"
 msgstr "сброс"
 
-#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:136
+#, fuzzy
+msgid "User used to connect to the share"
+msgstr "Выберите способ подключения к серверу терминалов"
+
+#: plugins/personal/environment/environment.tpl:139
+#, fuzzy
+msgid "Select a share"
+msgstr "Выберите, чтобы просмотреть серверы"
+
+#: plugins/personal/environment/environment.tpl:147
+#, fuzzy
+msgid "Mount path"
+msgstr "Контакт"
+
+#: plugins/personal/environment/environment.tpl:160
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:129
+#: plugins/personal/environment/environment.tpl:162
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 #, fuzzy
 msgid "Logon script management"
 msgstr "Управление системами"
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:196
+#: plugins/personal/environment/class_environment.inc:1169
 #, fuzzy
 msgid "Hotplug devices"
 msgstr "Дисковод"
 
-#: plugins/personal/environment/environment.tpl:154
+#: plugins/personal/environment/environment.tpl:198
 #, fuzzy
 msgid "Hotplug device settings"
 msgstr "Дисковод"
 
-#: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_groupManagement.inc:464
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
+#: plugins/personal/environment/environment.tpl:212
+#: plugins/admin/groups/class_divListGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:90
 msgid "New"
 msgstr "Создать"
 
-#: plugins/personal/environment/environment.tpl:166
+#: plugins/personal/environment/environment.tpl:215
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:174
+#: plugins/personal/environment/environment.tpl:230
 #, fuzzy
 msgid "Printer settings"
 msgstr "Настройки телефона"
 
-#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/environment.tpl:247
 #, fuzzy
-msgid "Admin Toggle"
-msgstr "Пользователи домена"
+msgid "Toggle admin"
+msgstr "Личная информация"
+
+#: plugins/personal/environment/environment.tpl:250
+#, fuzzy
+msgid "Toggle default"
+msgstr "по умолчанию"
 
-#: plugins/personal/environment/main.inc:124
+#: plugins/personal/environment/main.inc:116
 #, fuzzy
 msgid "User environment settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 #, fuzzy
 msgid "Invalid character in description. Please specify a valid description."
 msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 #, fuzzy
 msgid "Please specify a valid id."
 msgstr "Введите корректное имя пользователя!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 #, fuzzy
 msgid "An Entry with this name already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 #, fuzzy
 msgid "Please select an entry or press cancel."
 msgstr "Введите корректный номер телефона!"
 
 #: plugins/personal/environment/class_selectPrinterDialog.inc:69
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:102
 #, fuzzy
 msgid "Please select a printer or press cancel."
 msgstr "Введите корректный номер телефона!"
@@ -2882,8 +3683,10 @@ msgstr "Выбрать раздел, для которого будет осущ
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/class_divListUsers.inc:72
+#: plugins/admin/applications/class_divListApplication.inc:58
 #: plugins/admin/systems/glpiSelectUser.tpl:35
+#: plugins/admin/fai/class_divListFai.inc:81
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr "Фильтр"
@@ -2893,37 +3696,51 @@ msgstr "Фильтр"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
-#: plugins/personal/environment/class_environment.inc:255
-#: plugins/personal/environment/class_environment.inc:292
+#: plugins/personal/environment/class_environment.inc:205
 #, fuzzy
-msgid "Remove environment extension"
-msgstr "УдалиÑ\82Ñ\8c паÑ\80амеÑ\82Ñ\80Ñ\8b"
+msgid "auto"
+msgstr "Ð\9eÑ\82ноÑ\88ение"
 
-#: plugins/personal/environment/class_environment.inc:256
-#: plugins/personal/environment/class_environment.inc:293
-#, fuzzy
-msgid "Environment extension enabled. You can disable it by clicking below."
-msgstr ""
+#: plugins/personal/environment/class_environment.inc:227
+#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:88
+#, 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:305
+#: plugins/personal/environment/class_environment.inc:345
+#, fuzzy
+msgid "Remove environment extension"
+msgstr "Удалить параметры"
+
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:346
+#, fuzzy
+msgid "Environment extension enabled. You can disable it by clicking below."
+msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/personal/environment/class_environment.inc:265
-#: plugins/personal/environment/class_environment.inc:270
-#: plugins/personal/environment/class_environment.inc:298
-#: plugins/personal/environment/class_environment.inc:303
+#: plugins/personal/environment/class_environment.inc:315
+#: plugins/personal/environment/class_environment.inc:320
+#: plugins/personal/environment/class_environment.inc:351
+#: plugins/personal/environment/class_environment.inc:356
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:266
-#: plugins/personal/environment/class_environment.inc:299
+#: plugins/personal/environment/class_environment.inc:316
+#: plugins/personal/environment/class_environment.inc:352
 #, fuzzy
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/personal/environment/class_environment.inc:271
-#: plugins/personal/environment/class_environment.inc:304
+#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:357
 #, fuzzy
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
@@ -2932,59 +3749,109 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/personal/environment/class_environment.inc:383
-#, fuzzy
-msgid "auto"
-msgstr "Отношение"
-
-#: plugins/personal/environment/class_environment.inc:416
+#: plugins/personal/environment/class_environment.inc:460
+#: plugins/personal/environment/class_environment.inc:802
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 #, fuzzy
 msgid "None"
 msgstr "нет"
 
-#: plugins/personal/environment/class_environment.inc:421
+#: plugins/personal/environment/class_environment.inc:474
+#, fuzzy
+msgid "You are not allowed to write Logon scripts."
+msgstr "У вас недостаточно прав для удаления этого пользователя!"
+
+#: plugins/personal/environment/class_environment.inc:553
+#: plugins/personal/environment/class_environment.inc:564
+#: plugins/admin/systems/class_terminalStartup.inc:187
+#: plugins/admin/systems/class_workstationStartup.inc:588
+#, fuzzy
+msgid "You must specify a valid mount point."
+msgstr "Введите корректное имя пользователя!"
+
+#: plugins/personal/environment/class_environment.inc:623
+#: plugins/personal/environment/class_environment.inc:624
+#: plugins/personal/environment/class_environment.inc:632
+#: plugins/personal/environment/class_environment.inc:633
+#, fuzzy
+msgid "Reset password hash"
+msgstr "Изменить пароль"
+
+#: plugins/personal/environment/class_environment.inc:637
+#, fuzzy
+msgid "Delete share entry"
+msgstr "Удалить"
+
+#: plugins/personal/environment/class_environment.inc:805
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:517
-#: plugins/personal/environment/class_environment.inc:528
-#: plugins/admin/systems/class_terminalStartup.inc:156
-#: plugins/admin/systems/class_workstationStartup.inc:533
-#, fuzzy
-msgid "You must specify a valid mount point."
-msgstr "Введите корректное имя пользователя!"
+#: plugins/personal/environment/class_environment.inc:843
+#, fuzzy, php-format
+msgid "Removing of user/environment account with dn '%s' failed."
+msgstr "Удалить параметры"
 
-#: plugins/personal/environment/class_environment.inc:764
+#: plugins/personal/environment/class_environment.inc:896
 #, fuzzy
 msgid "Please set a valid profile quota size."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/personal/environment/class_environment.inc:771
+#: plugins/personal/environment/class_environment.inc:903
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:809
+#: plugins/personal/environment/class_environment.inc:941
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:903
-msgid "Error while writing printer"
-msgstr ""
+#: plugins/personal/environment/class_environment.inc:1070
+#, fuzzy, php-format
+msgid "Saving of user/environment account with dn '%s' failed."
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/environment/class_environment.inc:1083
+#, fuzzy
+msgid "group share"
+msgstr "группы"
+
+#: plugins/personal/environment/class_environment.inc:1116
+#, fuzzy
+msgid "Administrator"
+msgstr "Администрирование"
+
+#: plugins/personal/environment/class_environment.inc:1121
+#: plugins/personal/environment/class_environment.inc:1167
+msgid "Default printer"
+msgstr "Принтер по умолчанию"
+
+#: plugins/personal/environment/class_environment.inc:1147
+#, fuzzy
+msgid "Environment settings"
+msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/environment/class_environment.inc:974
-msgid "Error while writing printer settings"
+#: plugins/personal/environment/class_environment.inc:1154
+msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1088
+#: plugins/personal/environment/class_environment.inc:1161
 #, fuzzy
-msgid "Admin"
-msgstr "DN администратора"
+msgid "Profile quota"
+msgstr "Путь к профилю"
+
+#: plugins/personal/environment/class_environment.inc:1162
+#, fuzzy
+msgid "Profile server"
+msgstr "Сервер для хранения запросов и временных файлов"
+
+#: plugins/personal/environment/class_environment.inc:1168
+#: plugins/personal/environment/logonManagement.tpl:56
+msgid "Logon script"
+msgstr ""
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:1
 #, fuzzy
@@ -3015,6 +3882,11 @@ msgstr "Указанное имя уже используется."
 
 #: plugins/personal/environment/class_logonManagementDialog.inc:101
 #, fuzzy
+msgid "Please specify a valid script name."
+msgstr "Введите корректное имя пользователя!"
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:105
+#, fuzzy
 msgid "Specified description contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
@@ -3030,24 +3902,51 @@ msgstr "Список"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/phone.tpl:25
+#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:797
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:272
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
+#: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 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/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
-#: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:51
+#: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/paste_generic.tpl:21
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3071,16 +3970,20 @@ msgstr ""
 msgid "Script can be replaced by user"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:56
-msgid "Logon script"
-msgstr ""
-
 #: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/blocklists/generic.tpl:88
 #: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/addons/notifications/contents.tpl:12
+#: plugins/admin/groups/class_groupManagement.inc:333
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/users/class_userManagement.inc:630
+#: plugins/admin/applications/class_applicationManagement.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:491
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/ogroups/class_ogroupManagement.inc:335
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3089,6 +3992,11 @@ msgstr ""
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiNewBranch.tpl:19
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:348
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:244
+#: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
+#: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
 msgid "Apply"
 msgstr "Применить"
 
@@ -3132,9 +4040,18 @@ msgstr "Имя сервера"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
 #, fuzzy
+msgid "Vendor ID"
+msgstr "Идентификатор отправителя"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
+#, fuzzy
 msgid "Device ID"
 msgstr "Устройства"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 #, fuzzy
@@ -3148,14 +4065,15 @@ msgid "Browse"
 msgstr "Просмотр"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpi_edit_type.tpl:15
 #: plugins/admin/systems/glpiManufacturer.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:202
+#: include/class_MultiSelectWindow.inc:79
 #, fuzzy
 msgid "Close"
 msgstr "Выбрать"
@@ -3166,42 +4084,43 @@ msgid "Nagios Account"
 msgstr "Контакт"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 #, 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/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 #, fuzzy
 msgid "Host notification period"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 #, fuzzy
 msgid "Service notification period"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 #, fuzzy
 msgid "Service notification options"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 #, fuzzy
 msgid "Host notification options"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 #, fuzzy
 msgid "Service notification commands"
 msgstr "Параметры приложения"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 #, fuzzy
 msgid "Host notification commands"
 msgstr "Параметры приложения"
@@ -3275,6 +4194,11 @@ msgstr ""
 "В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
 "щелкнув ниже."
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:147
+#, fuzzy, php-format
+msgid "Saving of user/nagios account with dn '%s' failed."
+msgstr "Создать настройки запись эл. почты"
+
 #: plugins/personal/nagios/class_nagiosAccount.inc:167
 #, fuzzy
 msgid "The required field 'NagiosAlias' is not set."
@@ -3291,49 +4215,136 @@ msgstr "Обязательное поле \"Имя\" не заполнено."
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr "Введите корректное значение в поле \"Основной адрес\"."
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:226
+#, fuzzy, php-format
+msgid "Removing of user/nagios account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+#, fuzzy
+msgid "View all hosts"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "Системная информация"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+msgid "Trigger all host commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "Информация об организации"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "Системная информация"
+
 #: plugins/personal/nagios/main.inc:124
 #, fuzzy
 msgid "Nagios settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Стоп-листы"
+#: plugins/personal/netatalk/main.inc:121
+#, fuzzy
+msgid "Netatalk settings"
+msgstr "Сетевые настройки"
+
+#: plugins/personal/netatalk/class_netatalk.inc:37
+#, fuzzy
+msgid "Manage netatalk account"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+#, fuzzy
+msgid "This account has no netatalk extensions."
+msgstr "В этой учетной записи нет почтовых расширений."
 
-#: plugins/gofax/blocklists/headpage.tpl:24
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid "Remove netatalk account"
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
 #, fuzzy
 msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные стоп-"
-"листы. Если у вас достаточно большое количество списков, вы можете "
-"использовать групповое выделение."
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Выберите, чтобы просмотреть стоп-листы (отправка)"
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+#, fuzzy
+msgid "Create netatalk account"
+msgstr "Создать настройки запись эл. почты"
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Показать стоп-листы отправки"
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#, fuzzy
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr "Выберите, чтобы просмотреть стоп-листы (получение)"
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Показать стоп-листы получения"
+#: plugins/personal/netatalk/class_netatalk.inc:256
+#, fuzzy, php-format
+msgid "Saving of user/netatalk account with dn '%s' failed."
+msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr "Шаблон для стоп-листов"
+#: plugins/personal/netatalk/class_netatalk.inc:316
+#, fuzzy, php-format
+msgid "Removing of user/netatalk account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
 
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr "Регулярное выражение, соответствующее именам списков"
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Домашний каталог"
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+#, fuzzy
+msgid "Share"
+msgstr "сброс"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:275
+msgid "Path"
+msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
@@ -3347,374 +4358,528 @@ msgstr "Имя стоп-листа"
 msgid "Select subtree to place blocklist in"
 msgstr "Выберите ветку стоп-листа"
 
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:273
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiSummaryTab.inc:309
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
 msgid "Type"
 msgstr "Тип"
 
-#: plugins/gofax/blocklists/generic.tpl:34
+#: plugins/gofax/blocklists/generic.tpl:39
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
 
-#: plugins/gofax/blocklists/generic.tpl:43
+#: plugins/gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Описание стоп-листа"
 
-#: plugins/gofax/blocklists/generic.tpl:56
+#: plugins/gofax/blocklists/generic.tpl:61
 msgid "Blocked numbers"
 msgstr "Блокируемые номера"
 
-#: plugins/gofax/blocklists/generic.tpl:72
+#: plugins/gofax/blocklists/generic.tpl:77
 msgid "Numbers can also contain wild cards."
 msgstr "Вместо точных номеров можно использовать шаблоны."
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+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/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/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_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Стоп-лист номеров (факсы)"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:172
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Вы собираетесь удалить стоп-лист '%s'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:247
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:189
 msgid "You have no permission to remove this blocklist."
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:257
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:204
 msgid "Please specify a valid phone number."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
-#: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:450
-#: plugins/admin/fai/class_faiManagement.inc:642
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
-#, fuzzy
-msgid "Go to root department"
-msgstr "Список подразделений"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "send"
+msgstr "отправка"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/groups/class_groupManagement.inc:459
-#: plugins/admin/users/class_userManagement.inc:765
-#: plugins/admin/applications/class_applicationManagement.inc:475
-#: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
-#: plugins/admin/fai/class_faiManagement.inc:642
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
-#, fuzzy
-msgid "Root"
-msgstr "Перезагрузить"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "receive"
+msgstr "получение"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
-#: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/admin/fai/class_faiManagement.inc:645
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-#, fuzzy
-msgid "Go up one department"
-msgstr "Подразделение"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:413
+#, fuzzy, php-format
+msgid "Removing of blocklist with dn '%s' failed."
+msgstr "Удалить приложения"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:766
-#: plugins/admin/applications/class_applicationManagement.inc:476
-#: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:761
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:645
-#: plugins/admin/fai/class_faiProfile.inc:303
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr ""
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
+msgid "You have no permissions to create a blocklist on this 'Base'."
+msgstr "У вас недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:453
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-#, fuzzy
-msgid "Go to users department"
-msgstr "Выберите подразделение"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
+msgid "Required field 'Name' is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:315
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/departments/class_departmentManagement.inc:301
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:454
-#: plugins/admin/fai/class_faiManagement.inc:648
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-#, fuzzy
-msgid "Home"
-msgstr "Имя системы"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
+msgid "Required field 'Name' contains invalid characters"
+msgstr "Значение поля 'Имя' содержит недопустимые символы."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_ogroupManagement.inc:455
-#: plugins/admin/fai/class_faiManagement.inc:650
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
-msgid "Reload list"
-msgstr ""
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
+msgid "Specified name is already used."
+msgstr "Указанное имя уже используется."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:462
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:768
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:478
-#: plugins/admin/applications/class_applicationManagement.inc:484
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: 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_ogroupManagement.inc:455
-#: plugins/admin/ogroups/class_ogroupManagement.inc:461
-#: plugins/admin/fai/class_faiManagement.inc:650
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr ""
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
+msgid "No permission to create a blocklist on this base."
+msgstr "Недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
-#, fuzzy
-msgid "Create new blocklist"
-msgstr "Имя стоп-листа"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
-#, fuzzy
-msgid "New Blocklist"
-msgstr "\"Черные списки\""
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
+#, fuzzy, php-format
+msgid "Saving of blocklist with dn '%s' failed."
+msgstr "Приложение"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:320
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/applications/class_applicationManagement.inc:484
-#: plugins/admin/departments/class_departmentManagement.inc:307
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/ogroups/class_ogroupManagement.inc:461
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
 #, fuzzy
-msgid "Submit department"
-msgstr "Ð\9fоказаÑ\82Ñ\8c подÑ\80азделениÑ\8f"
+msgid "Fax Blocklists"
+msgstr "СÑ\82оп-лиÑ\81Ñ\82 номеÑ\80ов (Ñ\84акÑ\81Ñ\8b)"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/users/class_userManagement.inc:783
-#: plugins/admin/users/class_userManagement.inc:790
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
-#: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/systems/class_systemManagement.inc:787
-#: plugins/admin/systems/glpiPrinter.tpl:15
-#: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
-#: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/ogroups/class_ogroupManagement.inc:473
-#: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:698
-#: plugins/admin/fai/class_faiManagement.inc:798
-#: plugins/admin/fai/class_faiManagement.inc:803
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-#, fuzzy
-msgid "edit"
-msgstr "Изменить"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:796
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 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/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Фамилия"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/admin/users/class_userManagement.inc:784
-#: plugins/admin/users/class_userManagement.inc:791
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
 #, fuzzy
-msgid "Edit user"
-msgstr "Ð\9fолÑ\8cзоваÑ\82ели домена"
+msgid "Blocklist type"
+msgstr "УпÑ\80авление \"Ñ\87еÑ\80нÑ\8bми Ñ\81пиÑ\81ками\""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/users/class_userManagement.inc:787
-#: plugins/admin/users/class_userManagement.inc:794
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
-#: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/systems/class_systemManagement.inc:788
-#: plugins/admin/ogroups/class_ogroupManagement.inc:475
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:699
-#: plugins/admin/fai/class_faiManagement.inc:805
-#: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-#, fuzzy
-msgid "delete"
-msgstr "Удалить"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:31
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:32
+msgid "List of blocklists"
+msgstr "Стоп-листы"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:36
 #, fuzzy
-msgid "Delete user"
-msgstr "Удалить"
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"подразделения. Если у вас достаточно большое количество подразделений, вы "
+"можете использовать групповое выделение."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:330
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #, fuzzy
 msgid "Blocklist name"
 msgstr "Управление \"черными списками\""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:331
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:53
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:534
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/applications/class_applicationManagement.inc:525
-#: plugins/admin/departments/class_departmentManagement.inc:322
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/groups/class_divListGroup.inc:57
+#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/applications/class_divListApplication.inc:52
+#: plugins/admin/departments/class_divListDepartment.inc:42
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/fai/class_faiManagement.inc:695
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:350
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_divListSystem.inc:59
+#: plugins/admin/systems/class_divListSystemService.inc:31
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/admin/acl/class_divListACL.inc:50
+#: plugins/admin/fai/class_divListFai.inc:66
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:56
+#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/conference/class_divListConferences.inc:55
 msgid "Actions"
 msgstr "Действия"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:334
-msgid "This table displays faxblocklists for the selected tree."
-msgstr ""
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
+msgid "Select to see send blocklists"
+msgstr "Выберите, чтобы просмотреть стоп-листы (отправка)"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:402
-msgid "send"
-msgstr "оÑ\82пÑ\80авка"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
+msgid "Show send blocklists"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81Ñ\82оп-лиÑ\81Ñ\82Ñ\8b оÑ\82пÑ\80авки"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:402
-msgid "receive"
-msgstr "полÑ\83Ñ\87ение"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Select to see receive blocklists"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е, Ñ\87Ñ\82обÑ\8b пÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\81Ñ\82оп-лиÑ\81Ñ\82Ñ\8b (полÑ\83Ñ\87ение)"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:553
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f Ñ\81Ñ\82оп-лиÑ\81Ñ\82а в Ñ\8dÑ\82ой веÑ\82ке."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Show receive blocklists"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81Ñ\82оп-лиÑ\81Ñ\82Ñ\8b полÑ\83Ñ\87ениÑ\8f"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
-#: plugins/admin/departments/class_departmentGeneric.inc:200
-msgid "Required field 'Name' is not set."
-msgstr "Обязательное поле \"Имя\" не заполнено."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:68
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/applications/class_divListApplication.inc:55
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
+#, fuzzy
+msgid "Select to search within subtrees"
+msgstr "Искать в поддеревьях"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:562
-msgid "Required field 'Name' contains invalid characters"
-msgstr "Ð\97наÑ\87ение полÑ\8f 'Ð\98мÑ\8f' Ñ\81одеÑ\80жиÑ\82 недопÑ\83Ñ\81Ñ\82имÑ\8bе Ñ\81имволÑ\8b."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:63
+msgid "Regular expression for matching list names"
+msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам Ñ\81пиÑ\81ков"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
-msgid "Specified name is already used."
-msgstr "Указанное имя уже используется."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/users/class_divListUsers.inc:100
+#: plugins/admin/applications/class_divListApplication.inc:99
+#: plugins/admin/departments/class_divListDepartment.inc:69
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/acl/class_divListACL.inc:82
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
+#, fuzzy
+msgid "Go to root department"
+msgstr "Список подразделений"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
-msgid "No permission to create a blocklist on this base."
-msgstr "Недостаточно прав для создания стоп-листа в этой ветке."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/users/class_divListUsers.inc:100
+#: plugins/admin/applications/class_divListApplication.inc:99
+#: plugins/admin/departments/class_divListDepartment.inc:69
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/acl/class_divListACL.inc:82
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
+#, fuzzy
+msgid "Root"
+msgstr "Перезагрузить"
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/fai/remove.tpl:2 plugins/admin/fai/remove_branch.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/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-msgid "Warning"
-msgstr "Предупреждение"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:70
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:96
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/acl/class_divListACL.inc:84
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
+#, fuzzy
+msgid "Go up one department"
+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."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:70
+#: 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_divListSystem.inc:96
+#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/acl/class_divListACL.inc:84
+#: plugins/admin/fai/class_faiProfile.inc:299
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
+#: include/class_acl.inc:362
+msgid "Up"
 msgstr ""
-"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-"сможет отменить результаты этой операции."
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.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/admin/fai/remove_branch.tpl:10
-#: plugins/gofon/macro/remove.tpl:9
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:103
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/admin/acl/class_divListACL.inc:86
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
 #, fuzzy
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgid "Go to users department"
+msgstr "Выберите подразделение"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:103
+#: plugins/admin/departments/class_divListDepartment.inc:71
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/admin/acl/class_divListACL.inc:86
+#: plugins/admin/fai/class_divListFai.inc:123
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
+#, fuzzy
+msgid "Home"
+msgstr "Имя системы"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/departments/class_divListDepartment.inc:72
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/acl/class_divListACL.inc:88
+#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:114
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:87
+msgid "Reload list"
 msgstr ""
-"Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
-"нажмите <i>Отмена</i>."
 
-#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
-msgid "Blocklist management"
-msgstr "Управление \"черными списками\""
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/groups/class_divListGroup.inc:109
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/departments/class_divListDepartment.inc:72
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/ogroups/class_divListOGroup.inc:120
+#: plugins/admin/acl/class_divListACL.inc:88
+#: plugins/admin/acl/class_divListACL.inc:94
+#: plugins/admin/fai/class_divListFai.inc:126
+#: plugins/admin/fai/class_divListFai.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:114
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/macro/class_divListMacros.inc:94
+#: plugins/gofon/conference/class_divListConferences.inc:87
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#, fuzzy
+msgid "Create new blocklist"
+msgstr "Имя стоп-листа"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#, fuzzy
+msgid "New Blocklist"
+msgstr "\"Черные списки\""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:109
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/ogroups/class_divListOGroup.inc:120
+#: plugins/admin/acl/class_divListACL.inc:94
+#: plugins/admin/fai/class_divListFai.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/gofon/macro/class_divListMacros.inc:94
+#: plugins/gofon/conference/class_divListConferences.inc:95
+#, fuzzy
+msgid "Submit department"
+msgstr "Показать подразделения"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
+#: plugins/admin/groups/class_divListGroup.inc:169
+#: plugins/admin/users/class_divListUsers.inc:221
+#: plugins/admin/applications/class_divListApplication.inc:162
+#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/systems/glpiPrinter.tpl:15
+#: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
+#: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:156
+#: plugins/admin/ogroups/class_divListOGroup.inc:161
+#: plugins/admin/acl/class_divListACL.inc:122
+#: plugins/admin/fai/class_faiScript.inc:238
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:208
+#: plugins/admin/fai/class_faiTemplate.inc:211
+#: plugins/admin/fai/class_faiHook.inc:261
+#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_divListFai.inc:221
+#: plugins/admin/fai/class_divListFai.inc:226
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:128
+#: plugins/gofon/conference/class_divListConferences.inc:124
+#: include/class_acl.inc:364 include/class_acl.inc:409
+#, fuzzy
+msgid "edit"
+msgstr "Изменить"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
+#: plugins/admin/users/class_divListUsers.inc:222
+#, fuzzy
+msgid "Edit user"
+msgstr "Пользователи домена"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/admin/groups/class_divListGroup.inc:172
+#: plugins/admin/users/class_divListUsers.inc:226
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/systems/class_divListSystem.inc:158
+#: plugins/admin/ogroups/class_divListOGroup.inc:164
+#: plugins/admin/acl/class_divListACL.inc:125
+#: plugins/admin/fai/class_faiScript.inc:242
+#: plugins/admin/fai/class_faiTemplate.inc:212
+#: plugins/admin/fai/class_faiHook.inc:265
+#: plugins/admin/fai/class_divListFai.inc:229
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:174
+#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:131
+#: plugins/gofon/conference/class_divListConferences.inc:127
+#: plugins/gofon/conference/class_divListConferences.inc:129
+#: include/class_acl.inc:365 include/class_acl.inc:410
+#, fuzzy
+msgid "delete"
+msgstr "Удалить"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/admin/users/class_divListUsers.inc:227
+#, fuzzy
+msgid "Delete user"
+msgstr "Удалить"
 
 #: plugins/gofax/faxaccount/generic.tpl:12
 #: plugins/gofax/faxaccount/paste_generic.tpl:13
@@ -3722,7 +4887,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Номер факса, для которого сработает GOfax"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Язык"
@@ -3733,6 +4900,7 @@ msgstr ""
 "Укаэите предпочтительный язык для получения сообщений о факсах по эл. почте"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Формат доставки"
 
@@ -3758,6 +4926,7 @@ msgid "Deliver fax as mail"
 msgstr "Отправлять факсы по эл. почте"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Отправлять факсы на принтер"
 
@@ -3857,38 +5026,66 @@ msgstr ""
 msgid "You're trying to add an invalid phone number."
 msgstr "Вы пытаетесь ввести некорректный номер телефона."
 
-#: 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:616
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
+#: plugins/admin/groups/class_groupApplication.inc:632
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 #, fuzzy
 msgid "back"
 msgstr "Назад"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
+#, fuzzy, php-format
+msgid "Removing of user/fax account with dn '%s' failed."
+msgstr "Удалить учетную запись POSIX"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr "Обязательное поле \"Факс\" не заполнено."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: 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:652
+#: 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:654
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 #, fuzzy
 msgid "The mail address you've entered is invalid."
 msgstr "Введенный вами адрес уже используется."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
+#: 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
+#, fuzzy, php-format
+msgid "Saving of user/fax account with dn '%s' failed."
+msgstr "Аккаунт Proxy"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Настройки Samba"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Показать стоп-листы получения"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Показать стоп-листы отправки"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3935,8 +5132,8 @@ msgstr "Поиск"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:740
-#: plugins/admin/ogroups/class_ogroupManagement.inc:591
+#: plugins/admin/systems/class_printGeneric.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:382
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr "Пользователь"
@@ -4007,7 +5204,7 @@ msgstr "Сообщение о состоянии"
 msgid "Transfer time"
 msgstr "Время передачи"
 
-#: plugins/gofax/faxreports/main.inc:5
+#: plugins/gofax/faxreports/main.inc:18
 msgid "FAX reports"
 msgstr "Отчеты о факсах"
 
@@ -4015,75 +5212,48 @@ msgstr "Отчеты о факсах"
 msgid "FAX Reports"
 msgstr "Отчеты о факсах"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
+#: 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:112
+#: plugins/gofax/faxreports/class_faxreport.inc:109
 #: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
+#: 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:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
+#: 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:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:148
+#: plugins/gofax/faxreports/class_faxreport.inc:266
 msgid "Query for fax database failed!"
 msgstr "Невозможно выполнить запрос к базе данных факсов!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:185
+#: 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:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+#: plugins/gofon/fonreports/class_fonreport.inc:202
 msgid "Y-M-D"
 msgstr "Г-М-Д"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/faiPartitionTable.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/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Фамилия"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Отчеты о факсах"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Клиентские устройства"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4111,7 +5281,7 @@ msgid "Add entry"
 msgstr "Добавить объект"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:698
+#: plugins/admin/groups/class_groupApplication.inc:714
 msgid "Edit entry"
 msgstr "Редактиовать объект"
 
@@ -4211,10 +5381,11 @@ msgstr "Город"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Страна"
 
-#: plugins/addons/addressbook/main.inc:23
+#: plugins/addons/addressbook/main.inc:37
 msgid "Address book"
 msgstr "Адресная книга"
 
@@ -4234,12 +5405,18 @@ msgid ""
 msgstr ""
 "У вас нет персонального набора телефонов. Настройте это прежде чем звонить."
 
-#: plugins/addons/addressbook/class_addressbook.inc:186
-#: plugins/addons/addressbook/class_addressbook.inc:287
+#: plugins/addons/addressbook/class_addressbook.inc:180
+#: plugins/addons/addressbook/class_addressbook.inc:650
+#, fuzzy, php-format
+msgid "Removing of addressbook entry '%s' failed."
+msgstr "Показать объекты адресной книги"
+
+#: plugins/addons/addressbook/class_addressbook.inc:187
+#: plugins/addons/addressbook/class_addressbook.inc:288
 msgid "You are not allowed to delete this entry!"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:281
+#: plugins/addons/addressbook/class_addressbook.inc:282
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Вы собираетесь удалить объект %s."
@@ -4275,16 +5452,11 @@ msgstr "Создание нового объекта в"
 #: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/logview/class_logview.inc:94
 #: plugins/addons/logview/class_logview.inc:111
-#: plugins/addons/mailqueue/class_mailqueue.inc:286
-#: plugins/addons/mailqueue/class_mailqueue.inc:351
+#: plugins/addons/mailqueue/class_mailqueue.inc:305
+#: plugins/addons/mailqueue/class_mailqueue.inc:370
 msgid "All"
 msgstr "Все"
 
-#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
-#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
-msgid "Given name"
-msgstr "Имя"
-
 #: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Work phone"
 msgstr "Рабочий телефон"
@@ -4297,12 +5469,6 @@ msgstr "Сотовый телефон"
 msgid "Home phone"
 msgstr "Домашний телефон"
 
-#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
-#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299
-msgid "User ID"
-msgstr "Идентификатор пользователя"
-
 #: plugins/addons/addressbook/class_addressbook.inc:597
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
@@ -4350,7 +5516,7 @@ msgstr ""
 msgid "Selected Template"
 msgstr "Выберите режим терминала"
 
-#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/main.inc:40
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 #, fuzzy
 msgid "LDAP manager"
@@ -4429,15 +5595,19 @@ msgid "Import LDIF File"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentimport.tpl:24
-msgid "Modify existing attributes"
+msgid "Modify existing objects, keep untouched attributes"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentimport.tpl:25
+msgid "Overwrite existing objects, all not listed attributes will be removed"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:33
+#: plugins/addons/ldapmanager/contentimport.tpl:34
 #, fuzzy
-msgid "Overwrite existing entry"
-msgstr "ЭкÑ\81поÑ\80Ñ\82 обÑ\8aекÑ\82а"
+msgid "Remove existing entries first"
+msgstr "УдалиÑ\82Ñ\8c Ñ\81еÑ\80виÑ\81 DNS"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:40
+#: plugins/addons/ldapmanager/contentimport.tpl:41
 #, fuzzy
 msgid "Import successful"
 msgstr "Импорт успешен."
@@ -4577,10 +5747,11 @@ msgid "Hostname"
 msgstr "Имя системы"
 
 #: plugins/addons/logview/contents.tpl:85
+#: plugins/addons/notifications/contents.tpl:44
 msgid "Message"
 msgstr "Сообщение"
 
-#: plugins/addons/logview/main.inc:23
+#: plugins/addons/logview/main.inc:33
 msgid "System log view"
 msgstr "Просмотр системного журнала"
 
@@ -4716,7 +5887,7 @@ msgid "Error"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:354
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 #, fuzzy
 msgid "Active"
 msgstr "Личный"
@@ -4764,7 +5935,7 @@ msgstr "Отправитель"
 msgid "Display header from this message"
 msgstr "Показать совпадения номеров"
 
-#: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/main.inc:38
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 #, fuzzy
 msgid "Mail queue"
@@ -4776,100 +5947,290 @@ msgid ""
 msgstr ""
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
-#: plugins/addons/mailqueue/class_mailqueue.inc:93
 #: plugins/addons/mailqueue/class_mailqueue.inc:112
+#: plugins/addons/mailqueue/class_mailqueue.inc:171
+#: plugins/addons/mailqueue/class_mailqueue.inc:198
+#, fuzzy, php-format
+msgid ""
+"You do not have permission to execute the command '%s' on the mailqueue."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:93
 #: plugins/addons/mailqueue/class_mailqueue.inc:121
-#: plugins/addons/mailqueue/class_mailqueue.inc:176
-#: plugins/addons/mailqueue/class_mailqueue.inc:203
+#: plugins/addons/mailqueue/class_mailqueue.inc:181
+#: plugins/addons/mailqueue/class_mailqueue.inc:213
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:256
+#: plugins/addons/mailqueue/class_mailqueue.inc:225
+msgid "There are no mail server specified."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:275
 msgid "up"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:258
+#: plugins/addons/mailqueue/class_mailqueue.inc:277
 #, fuzzy
 msgid "down"
 msgstr "Домен"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:301
+#: plugins/addons/mailqueue/class_mailqueue.inc:320
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:306
+#: plugins/addons/mailqueue/class_mailqueue.inc:325
 #, fuzzy
 msgid "hours"
 msgstr "час"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:352
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:353
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:355
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Not active"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Список групп"
+#: plugins/addons/godfs/contents.tpl:8
+#, fuzzy
+msgid "DFS Shares"
+msgstr "сброс"
 
-#: plugins/admin/groups/headpage.tpl:25
+#: plugins/addons/godfs/contents.tpl:26
 #, 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."
+"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 ""
 "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"гÑ\80Ñ\83ппÑ\8b полÑ\8cзоваÑ\82елей. Ð\95Ñ\81ли Ñ\83 ваÑ\81 иÑ\85 доÑ\81Ñ\82аÑ\82оÑ\87но болÑ\8cÑ\88ое колиÑ\87еÑ\81Ñ\82во, вÑ\8b можеÑ\82е "
-"использовать групповое выделение."
+"подÑ\80азделениÑ\8f. Ð\95Ñ\81ли Ñ\83 ваÑ\81 доÑ\81Ñ\82аÑ\82оÑ\87но болÑ\8cÑ\88ое колиÑ\87еÑ\81Ñ\82во подÑ\80азделений, вÑ\8b "
+"можеÑ\82е иÑ\81полÑ\8cзоваÑ\82Ñ\8c гÑ\80Ñ\83пповое вÑ\8bделение."
 
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Показать подходяшие адреса"
 
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Показать основные группы"
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Регулярное выражение, соответствующее именам систем"
 
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Выберите, чтобы просмотреть группы, которые входят в samba"
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Свойства"
 
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Показать группы samba"
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Подразделение"
 
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr "Выберите, чтобы просмотреть список групп, которым доступны приложения"
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Сервер"
 
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Показать группы приложений"
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Служба печати"
 
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Местоположение"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:10
+#, fuzzy
+msgid "DFS Managment"
+msgstr "Название"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:151
+#, fuzzy, php-format
+msgid "Removing of DFS share with dn '%s' failed."
+msgstr "Удалить сервис DNS"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
 msgstr ""
-"Выберите, чтобы просмотреть список групп, которым доступны функции эл. почты"
 
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Показать группы с эл. почтой"
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#, fuzzy
+msgid "Go up one dfsshare"
+msgstr "Подразделение"
 
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Выберите, чтобы просмотреть список обычных групп"
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
+msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Показать обычные группы"
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Создание нового объекта в"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:247
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+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/class_dfsgeneric.inc:186
+#, fuzzy, php-format
+msgid "Saving dfs/generic with dn '%s' failed."
+msgstr "Показать подразделения"
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:219
+#, fuzzy, php-format
+msgid "Removing dfs/generic with dn '%s' failed."
+msgstr "Показать подразделения"
+
+#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
+msgid "Distributed File System Administration"
+msgstr ""
+
+#: plugins/addons/notifications/main.inc:42
+#: plugins/addons/notifications/class_msgplug.inc:6
+#, fuzzy
+msgid "Notifications"
+msgstr "Специальность"
+
+#: plugins/addons/notifications/class_msgplug.inc:35
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:164
+#: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
+msgstr "Группы"
+
+#: plugins/addons/notifications/class_msgplug.inc:104
+#, fuzzy
+msgid "You have no permissions to send a message!"
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/addons/notifications/class_msgplug.inc:108
+#, fuzzy
+msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
+msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
+
+#: plugins/addons/notifications/class_msgplug.inc:116
+#: plugins/admin/systems/class_terminalGeneric.inc:171
+#: plugins/admin/systems/class_terminalGeneric.inc:183
+#: plugins/admin/systems/class_terminalGeneric.inc:195
+#: plugins/admin/systems/class_servGeneric.inc:80
+#: plugins/admin/systems/class_workstationGeneric.inc:144
+#: plugins/admin/ogroups/class_termgroup.inc:166
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "Ошибка при выполнении \"%s\"!"
+
+#: plugins/addons/notifications/class_msgplug.inc:122
+#, fuzzy
+msgid "Please specify at least one recipient to send a message!"
+msgstr "Введите корректное имя пользователя!"
+
+#: plugins/addons/notifications/class_msgplug.inc:214
+#, fuzzy
+msgid "No DESC tag in message file:"
+msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
+
+#: plugins/addons/notifications/contents.tpl:2
+#, fuzzy
+msgid "Notification target"
+msgstr "Изменить сертификаты"
+
+#: plugins/addons/notifications/contents.tpl:7
+msgid "Use target from"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:21
+#, fuzzy
+msgid "Available recipients"
+msgstr "Доступные приложения"
+
+#: plugins/addons/notifications/contents.tpl:22
+#: ihtml/themes/default/acl.tpl:30
+msgid "List message possible targets"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:33
+#, fuzzy
+msgid "Recipients"
+msgstr "Описание"
+
+#: plugins/addons/notifications/contents.tpl:34
+#: ihtml/themes/default/acl.tpl:42
+msgid "List message recipients"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:57
+#, fuzzy
+msgid "Send message"
+msgstr "Домашняя страница"
+
+#: plugins/addons/notifications/contents.tpl:68
+#, fuzzy
+msgid "Notification send!"
+msgstr "Изменить сертификаты"
+
+#: plugins/addons/notifications/contents.tpl:71
+msgid ""
+"Your message has been sent successfully. Press the continue button to get "
+"back to the notification plugin."
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:74
+#: plugins/admin/users/template.tpl:48
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
+#: plugins/admin/systems/SelectDeviceType.tpl:44
+#: plugins/admin/systems/ServiceAddDialog.tpl:29
+#: plugins/admin/fai/class_faiManagement.inc:430
+#: plugins/admin/fai/class_faiManagement.inc:595
+#: plugins/admin/fai/faiPackageNew.tpl:50
+#: 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
+#: ihtml/themes/default/snapshotdialog.tpl:80
+msgid "Continue"
+msgstr "Продолжить"
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
@@ -4904,195 +6265,82 @@ msgstr ""
 "действительно хотите удалить ее, так как GOsa не сможет отменить результаты "
 "этой операции."
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Управление группами"
 
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
-msgstr "Группы"
-
-#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:245
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/admin/groups/class_groupManagement.inc:371
-#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:251
+#: plugins/admin/groups/class_groupManagement.inc:282
 msgid "You are not allowed to delete this group!"
 msgstr "У вас недостаточно прав для удаления этой группы!"
 
-#: plugins/admin/groups/class_groupManagement.inc:449
-#: plugins/admin/applications/class_applicationManagement.inc:465
-#: plugins/admin/ogroups/class_ogroupManagement.inc:439
-#: include/class_CopyPasteHandler.inc:239
-#, fuzzy
-msgid "Paste"
-msgstr "Дата"
-
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/applications/class_applicationManagement.inc:467
-#: plugins/admin/ogroups/class_ogroupManagement.inc:441
-#: include/class_CopyPasteHandler.inc:241
-#, fuzzy
-msgid "Can't paste"
-msgstr "Создать телефонный аккаунт"
-
-#: plugins/admin/groups/class_groupManagement.inc:464
-#, fuzzy
-msgid "Create new group"
-msgstr "Создать телефонный аккаунт"
-
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#, fuzzy
-msgid "cut"
-msgstr "Выполнить"
-
-#: plugins/admin/groups/class_groupManagement.inc:474
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:491
-#: plugins/admin/ogroups/class_ogroupManagement.inc:469
-#, fuzzy
-msgid "Cut this entry"
-msgstr "Редактиовать объект"
-
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-msgid "copy"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:476
-#: plugins/admin/users/class_userManagement.inc:782
-#: plugins/admin/applications/class_applicationManagement.inc:493
-#: plugins/admin/ogroups/class_ogroupManagement.inc:471
-#, fuzzy
-msgid "Copy this entry"
-msgstr "Редактиовать объект"
-
-#: plugins/admin/groups/class_groupManagement.inc:478
-#: plugins/admin/groups/class_groupManagement.inc:483
-#: plugins/admin/applications/class_applicationManagement.inc:495
-#: plugins/admin/applications/class_applicationManagement.inc:501
-#: plugins/admin/departments/class_departmentManagement.inc:314
-#: plugins/admin/ogroups/class_ogroupManagement.inc:473
-#: plugins/admin/ogroups/class_ogroupManagement.inc:478
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-#, fuzzy
-msgid "Edit this entry"
-msgstr "Редактиовать объект"
-
-#: plugins/admin/groups/class_groupManagement.inc:480
-#: plugins/admin/groups/class_groupManagement.inc:485
-#: plugins/admin/applications/class_applicationManagement.inc:497
-#: plugins/admin/applications/class_applicationManagement.inc:503
-#: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:475
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-#, fuzzy
-msgid "Delete this entry"
-msgstr "Удалить"
-
-#: plugins/admin/groups/class_groupManagement.inc:508
-#: plugins/admin/users/class_userManagement.inc:837
-#, fuzzy
-msgid "Posix"
-msgstr "Прокси-сервер"
-
-#: plugins/admin/groups/class_groupManagement.inc:517
-#: plugins/admin/applications/class_applicationManagement.inc:515
-#: plugins/admin/ogroups/class_ogroupManagement.inc:593
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Приложение"
-
-#: plugins/admin/groups/class_groupManagement.inc:532
-#, fuzzy
-msgid "Groupname"
-msgstr "Группа"
-
-#: plugins/admin/groups/class_groupManagement.inc:533
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/departments/generic.tpl:4
-#: plugins/admin/systems/terminal.tpl:1
-#: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/gofon/conference/generic.tpl:4
-msgid "Properties"
-msgstr "Свойства"
-
-#: plugins/admin/groups/class_groupManagement.inc:537
-#: plugins/admin/applications/class_applicationManagement.inc:529
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
-msgid "This table displays all groups, in the selected tree."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:129
+#: plugins/admin/groups/class_groupGeneric.inc:123
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:183
+#: plugins/admin/groups/class_groupGeneric.inc:177
 msgid "This 'dn' is no group."
 msgstr "Это DN соответствует не группе."
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Samba group"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain admins"
 msgstr "Администраторы домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain guests"
 msgstr "Непривилегированные пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:323
 #, php-format
 msgid "Special group (%d)"
 msgstr "Специальная группа (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:450
+#: plugins/admin/groups/class_groupGeneric.inc:435
+#, fuzzy
+msgid "! unknown id"
+msgstr "состояние неизвестно"
+
+#: plugins/admin/groups/class_groupGeneric.inc:467
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:467
-#, fuzzy
-msgid "! unknown id"
-msgstr "состояние неизвестно"
+#: plugins/admin/groups/class_groupGeneric.inc:496
+#: plugins/admin/groups/class_groupGeneric.inc:693
+#, fuzzy, php-format
+msgid "Removing of groups/generic with dn '%s' failed."
+msgstr "Показать группы приложений"
 
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:603
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:626
+#: plugins/admin/groups/class_groupGeneric.inc:608
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:740
+#: plugins/admin/groups/class_groupGeneric.inc:722
 #: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "У вас недостаточно прав для создания группы в этой ветке."
 
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/admin/groups/class_groupGeneric.inc:732
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -5100,25 +6348,55 @@ msgstr ""
 "Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
 "буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
+#: plugins/admin/groups/class_groupGeneric.inc:744
+#: plugins/admin/groups/class_groupGeneric.inc:758
+#: plugins/admin/groups/class_groupGeneric.inc:765
 msgid "Value specified as 'Name' is already used."
 msgstr "Группа с таким именем уже существует."
 
-#: plugins/admin/groups/application.tpl:3
+#: plugins/admin/groups/class_groupGeneric.inc:862
 #, fuzzy
-msgid "Release focus"
-msgstr "Ð\9dабоÑ\80 пÑ\80авил"
+msgid "Generic group settings"
+msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
 
-#: plugins/admin/groups/application.tpl:5
+#: plugins/admin/groups/class_groupGeneric.inc:874
 #, fuzzy
-msgid "Select release name"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е, Ñ\87Ñ\82обÑ\8b пÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\81еÑ\80веÑ\80ы"
+msgid "Phone pickup group"
+msgstr "ЧленÑ\8b Ñ\82елеÑ\84онной гÑ\80Ñ\83ппы"
 
-#: plugins/admin/groups/application.tpl:16
-msgid "Used applications"
-msgstr "Используемые приложения"
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Контакт"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Члены группы"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Группа Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
+#: 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
@@ -5129,67 +6407,86 @@ msgstr "Категория"
 msgid "Available applications"
 msgstr "Доступные приложения"
 
-#: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:315
-#: include/class_ldap.inc:422
-msgid "Object"
-msgstr "Объект"
-
-#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "Выбрать"
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "Применить эти права доступа только к собственным записям пользователей"
-
-#: plugins/admin/groups/class_groupMail.inc:278
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:510
+#: include/class_acl.inc:573
 msgid "read"
 msgstr "чтение"
 
-#: plugins/admin/groups/class_groupMail.inc:279
+#: plugins/admin/groups/class_groupMail.inc:285
 msgid "post"
 msgstr "отправка"
 
-#: plugins/admin/groups/class_groupMail.inc:280
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "external post"
 msgstr "отправка (внешн.)"
 
-#: plugins/admin/groups/class_groupMail.inc:281
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "append"
 msgstr "добавление"
 
-#: plugins/admin/groups/class_groupMail.inc:282
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:511
+#: include/class_acl.inc:574
 msgid "write"
 msgstr "запись"
 
-#: plugins/admin/groups/class_groupMail.inc:306
+#: plugins/admin/groups/class_groupMail.inc:312
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Для этого DN нет корректных почтовых расширений."
 
-#: plugins/admin/groups/class_groupMail.inc:371
+#: plugins/admin/groups/class_groupMail.inc:377
 msgid "You're trying to add an invalid email address "
 msgstr "Вы пытаетесь добавить некорректный адрес электронной почты "
 
-#: plugins/admin/groups/class_groupMail.inc:372
+#: plugins/admin/groups/class_groupMail.inc:378
 msgid "to the list of forwarders."
 msgstr "к списку тех, кому должны пересылаться сообщения."
 
-#: plugins/admin/groups/class_groupMail.inc:810
+#: plugins/admin/groups/class_groupMail.inc:613
+#, fuzzy, php-format
+msgid "Removing of groups/mail with dn '%s' failed."
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/admin/groups/class_groupMail.inc:777
+#, fuzzy, php-format
+msgid "Saving of groups/mail with dn '%s' failed."
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/admin/groups/class_groupMail.inc:806
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr "Введите корректное значение в поле \"Основной адрес\"."
 
-#: plugins/admin/groups/class_groupMail.inc:843
+#: plugins/admin/groups/class_groupMail.inc:839
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:847
+#: plugins/admin/groups/class_groupMail.inc:843
 #, fuzzy
 msgid "Please select a valid mail server."
 msgstr "Введите корректный серийный номер"
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Группа"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Альтернативные адреса"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Основной адрес"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:801
+#, fuzzy
+msgid "Permissions"
+msgstr "Права для членов группы"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Администраторы папки"
@@ -5198,6 +6495,11 @@ msgstr "Администраторы папки"
 msgid "Select a specific department"
 msgstr "Выберите подразделение."
 
+#: plugins/admin/groups/mail_admins.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "Выбрать"
+
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
 #: plugins/admin/ogroups/generic.tpl:7
 #: plugins/admin/ogroups/class_ogroup.inc:737
@@ -5216,41 +6518,41 @@ msgstr "Описание группы"
 msgid "Choose subtree to place group in"
 msgstr "Выберите ветку для группы"
 
-#: plugins/admin/groups/generic.tpl:37
+#: 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:37
+#: plugins/admin/groups/generic.tpl:41
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Указать GID вручную"
 
-#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/generic.tpl:43
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Указанный вручную GID"
 
-#: plugins/admin/groups/generic.tpl:46
+#: plugins/admin/groups/generic.tpl:50
 msgid "Select to create a samba conform group"
 msgstr "Создать группу для работы с Samba"
 
-#: plugins/admin/groups/generic.tpl:51
+#: plugins/admin/groups/generic.tpl:55
 msgid "in domain"
 msgstr "в домене"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:72
 msgid "Members are in a phone pickup group"
 msgstr "Члены телефонной группы"
 
-#: plugins/admin/groups/generic.tpl:81
+#: plugins/admin/groups/generic.tpl:85
 #, fuzzy
 msgid "Members are in a nagios group"
 msgstr "Члены телефонной группы"
 
-#: plugins/admin/groups/generic.tpl:97
+#: plugins/admin/groups/generic.tpl:101
 msgid "Group members"
 msgstr "Члены группы"
 
@@ -5259,7 +6561,7 @@ msgid "Select users to add"
 msgstr "Выбрать пользователей для добавления"
 
 #: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:62
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Выберите, чтобы просмотреть серверы"
@@ -5274,40 +6576,19 @@ msgid "Display users of department"
 msgstr "Подразделение"
 
 #: plugins/admin/groups/group_objects.tpl:47
-#: plugins/admin/users/headpage.tpl:49
 #: plugins/admin/systems/glpiSelectUser.tpl:37
 msgid "Regular expression for matching user names"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
-#: plugins/admin/groups/class_groupAcl.inc:59
-msgid "This 'dn' is no acl container."
-msgstr "Это DN не содержит ACL."
-
-#: plugins/admin/groups/class_groupAcl.inc:207
-msgid "All fields are writeable"
-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 "Показать адреса подразделения"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Показать подходяшие адреса"
-
-#: plugins/admin/groups/class_groupApplication.inc:368
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Это DN соответствует не группе приложений."
 
-#: plugins/admin/groups/class_groupApplication.inc:376
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Удалить приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:377
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5315,11 +6596,11 @@ msgstr ""
 "Этой группе доступны приложения. Вы можете запретить доступ к ним, щелкнув "
 "ниже."
 
-#: plugins/admin/groups/class_groupApplication.inc:379
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Создать приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:380
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5327,155 +6608,272 @@ msgstr ""
 "Этой группе недоступны приложения. Вы можете разрешить доступ к ним, щелкнув "
 "ниже."
 
-#: plugins/admin/groups/class_groupApplication.inc:392
+#: plugins/admin/groups/class_groupApplication.inc:417
 #, fuzzy
 msgid "Invalid character in category name."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/admin/groups/class_groupApplication.inc:400
+#: plugins/admin/groups/class_groupApplication.inc:425
 #, fuzzy
 msgid "The specified category already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/admin/groups/class_groupApplication.inc:490
+#: 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:526
+#: plugins/admin/groups/class_groupApplication.inc:556
 msgid "The selected application has no options."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:622
-#: plugins/admin/departments/class_departmentManagement.inc:338
-#: plugins/admin/fai/class_faiManagement.inc:719
+#: plugins/admin/groups/class_groupApplication.inc:638
+#: plugins/admin/departments/class_divListDepartment.inc:112
 #, fuzzy
 msgid "department"
 msgstr "подразделения"
 
-#: plugins/admin/groups/class_groupApplication.inc:630
+#: plugins/admin/groups/class_groupApplication.inc:646
 #, fuzzy
 msgid "application"
 msgstr "приложения"
 
-#: plugins/admin/groups/class_groupApplication.inc:661
-#: plugins/admin/groups/class_groupApplication.inc:697
+#: 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:665
-#: plugins/admin/groups/class_groupApplication.inc:695
+#: plugins/admin/groups/class_groupApplication.inc:681
+#: plugins/admin/groups/class_groupApplication.inc:711
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:666
-#: plugins/admin/groups/class_groupApplication.inc:696
+#: 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:693
+#: plugins/admin/groups/class_groupApplication.inc:709
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:721
+#: plugins/admin/groups/class_groupApplication.inc:737
 #, fuzzy
 msgid "This application is no longer available."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:724
+#: 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:728
+#: plugins/admin/groups/class_groupApplication.inc:744
 #, fuzzy
 msgid "Check parameter"
 msgstr "Изменить параметры"
 
-#: plugins/admin/groups/class_groupApplication.inc:730
+#: plugins/admin/groups/class_groupApplication.inc:746
 #, fuzzy
 msgid "This application has changed parameters."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/admin/groups/class_groupApplication.inc:905
+#: plugins/admin/groups/class_groupApplication.inc:832
+#, fuzzy, php-format
+msgid "Removing of groups/applications with dn '%s' failed."
+msgstr "Показать группы приложений"
+
+#: plugins/admin/groups/class_groupApplication.inc:877
+#, fuzzy, php-format
+msgid "Saving of groups/applications with dn '%s' failed."
+msgstr "Приложение"
+
+#: 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_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Показать приложения"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Приложение"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+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 "Показать адреса подразделения"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Показать подходяшие адреса"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 #, fuzzy
 msgid "Group settings"
 msgstr "Настройки Samba"
 
-#: plugins/admin/users/headpage.tpl:6
-#: plugins/admin/systems/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
+#: plugins/admin/groups/class_divListGroup.inc:35
+#: plugins/admin/groups/class_divListGroup.inc:36
+msgid "List of groups"
+msgstr "СпиÑ\81ок гÑ\80Ñ\83пп"
 
-#: plugins/admin/users/headpage.tpl:24
+#: plugins/admin/groups/class_divListGroup.inc:41
 #, fuzzy
 msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+"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 ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранных "
-"полÑ\8cзоваÑ\82елей. Ð\95Ñ\81ли Ñ\83 ваÑ\81 доÑ\81Ñ\82аÑ\82оÑ\87но болÑ\8cÑ\88ое колиÑ\87еÑ\81Ñ\82во полÑ\8cзоваÑ\82елей, вÑ\8b "
-"можеÑ\82е иÑ\81полÑ\8cзоваÑ\82Ñ\8c гÑ\80Ñ\83пповое вÑ\8bделение."
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"гÑ\80Ñ\83ппÑ\8b полÑ\8cзоваÑ\82елей. Ð\95Ñ\81ли Ñ\83 ваÑ\81 иÑ\85 доÑ\81Ñ\82аÑ\82оÑ\87но болÑ\8cÑ\88ое колиÑ\87еÑ\81Ñ\82во, вÑ\8b можеÑ\82е "
+"использовать групповое выделение."
 
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Выберите, чтобы просмотреть шаблоны псевдопользователей"
+#: plugins/admin/groups/class_divListGroup.inc:55
+#, fuzzy
+msgid "Groupname / Department"
+msgstr "Подразделение"
 
-#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:72
-msgid "Show templates"
-msgstr "Показать шаблоны"
+#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/systems/terminal.tpl:1
+#: plugins/admin/systems/workstation.tpl:1
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/gofon/conference/generic.tpl:4
+msgid "Properties"
+msgstr "Свойства"
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr ""
-"Выберите, чтобы просмотреть пользователей, у которых есть только объект GOsa"
+#: plugins/admin/groups/class_divListGroup.inc:60
+msgid "Select to see groups that are primary groups of users"
+msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Показать обычных пользователей"
+#: plugins/admin/groups/class_divListGroup.inc:60
+msgid "Show primary groups"
+msgstr "Показать основные группы"
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
+#: plugins/admin/groups/class_divListGroup.inc:61
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Выберите, чтобы просмотреть группы, которые входят в samba"
+
+#: plugins/admin/groups/class_divListGroup.inc:61
+msgid "Show samba groups"
+msgstr "Показать группы samba"
+
+#: plugins/admin/groups/class_divListGroup.inc:62
+msgid "Select to see groups that have applications configured"
+msgstr "Выберите, чтобы просмотреть список групп, которым доступны приложения"
+
+#: plugins/admin/groups/class_divListGroup.inc:62
+msgid "Show application groups"
+msgstr "Показать группы приложений"
+
+#: plugins/admin/groups/class_divListGroup.inc:63
+msgid "Select to see groups that have mail settings"
 msgstr ""
-"Выберите, чтобы просмотреть пользователей с атрибутами в стандарте POSIX"
+"Выберите, чтобы просмотреть список групп, которым доступны функции эл. почты"
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Показать UNIX-пользователей"
+#: plugins/admin/groups/class_divListGroup.inc:63
+msgid "Show mail groups"
+msgstr "Показать группы с эл. почтой"
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr "Выберите, чтобы просмотреть пользователей с настройками почты"
+#: plugins/admin/groups/class_divListGroup.inc:64
+msgid "Select to see normal groups that have only functional aspects"
+msgstr "Выберите, чтобы просмотреть список обычных групп"
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Ð\9fоказаÑ\82Ñ\8c полÑ\8cзоваÑ\82елей Ñ\81 поÑ\87Ñ\82ой"
+#: plugins/admin/groups/class_divListGroup.inc:64
+msgid "Show functional groups"
+msgstr "Ð\9fоказаÑ\82Ñ\8c обÑ\8bÑ\87нÑ\8bе гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Выберите, чтобы просмотреть пользователей с настройками Samba"
+#: plugins/admin/groups/class_divListGroup.inc:105
+#, fuzzy
+msgid "Create new group"
+msgstr "Создать телефонный аккаунт"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Показать пользователей Samba"
+#: plugins/admin/groups/class_divListGroup.inc:139
+#: plugins/admin/users/class_divListUsers.inc:161
+#, fuzzy
+msgid "Posix"
+msgstr "Прокси-сервер"
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Выберите, чтобы просмотреть пользователей с настройками прокси-сервера"
+#: plugins/admin/groups/class_divListGroup.inc:164
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/applications/class_divListApplication.inc:157
+#: plugins/admin/ogroups/class_divListOGroup.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
+#, fuzzy
+msgid "cut"
+msgstr "Выполнить"
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Показать пользователей с прокси-серверами"
+#: plugins/admin/groups/class_divListGroup.inc:164
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/applications/class_divListApplication.inc:157
+#: plugins/admin/ogroups/class_divListOGroup.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
+#, fuzzy
+msgid "Cut this entry"
+msgstr "Редактиовать объект"
+
+#: plugins/admin/groups/class_divListGroup.inc:166
+#: plugins/admin/users/class_divListUsers.inc:219
+#: plugins/admin/applications/class_divListApplication.inc:159
+#: plugins/admin/ogroups/class_divListOGroup.inc:158
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:169
+msgid "copy"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:166
+#: plugins/admin/users/class_divListUsers.inc:219
+#: plugins/admin/applications/class_divListApplication.inc:159
+#: plugins/admin/ogroups/class_divListOGroup.inc:158
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:169
+#, fuzzy
+msgid "Copy this entry"
+msgstr "Редактиовать объект"
+
+#: plugins/admin/groups/class_divListGroup.inc:169
+#: plugins/admin/applications/class_divListApplication.inc:162
+#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/ogroups/class_divListOGroup.inc:161
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/gofon/conference/class_divListConferences.inc:124
+#, fuzzy
+msgid "Edit this entry"
+msgstr "Редактиовать объект"
+
+#: plugins/admin/groups/class_divListGroup.inc:172
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:164
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:174
+#: plugins/gofon/conference/class_divListConferences.inc:127
+#: plugins/gofon/conference/class_divListConferences.inc:129
+#, fuzzy
+msgid "Delete this entry"
+msgstr "Удалить"
 
 #: plugins/admin/users/remove.tpl:6
 msgid ""
@@ -5499,234 +6897,248 @@ msgstr ""
 "вступят в силу немедленно. Пожалуйста, запомните новый пароль, так как иначе "
 "пользователь не сможет войти в систему."
 
-#: plugins/admin/users/class_userManagement.inc:28
-#: plugins/admin/systems/printer.tpl:66
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
-msgid "Users"
-msgstr "Пользователи"
-
-#: plugins/admin/users/class_userManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:273
 msgid "You are not allowed to set this users password!"
 msgstr "У вас недостаточно прав для смены пароля этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:312
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Вы собираетесь удалить пользователя %s."
 
-#: plugins/admin/users/class_userManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:345
 msgid "You are not allowed to delete this user!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:568
+#: plugins/admin/users/class_userManagement.inc:453
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "нет"
 
-#: plugins/admin/users/class_userManagement.inc:638
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Пользователь с таким именем уже есть в этой ветке."
 
-#: plugins/admin/users/class_userManagement.inc:770
-#, fuzzy
-msgid "Create new user"
-msgstr "Создание нового объекта в"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Создание пользователя на основе шаблона"
 
-#: plugins/admin/users/class_userManagement.inc:770
+#: plugins/admin/users/template.tpl:6
 #, fuzzy
-msgid "New user"
-msgstr "пользователи"
+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/class_userManagement.inc:771
-#, fuzzy
-msgid "Create new template"
-msgstr "Создать шаблон"
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/fai/class_faiTemplate.inc:414
+msgid "Template"
+msgstr "Шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:771
-msgid "New template"
-msgstr "Создать шаблон"
+#: 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
+msgid "List of users"
+msgstr "Список пользователей"
 
-#: plugins/admin/users/class_userManagement.inc:785
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_divListUsers.inc:40
 #, fuzzy
-msgid "password"
-msgstr "Пароль"
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранных "
+"пользователей. Если у вас достаточно большое количество пользователей, вы "
+"можете использовать групповое выделение."
 
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: plugins/admin/users/class_divListUsers.inc:56
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
 #: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: plugins/admin/users/class_userManagement.inc:805
-msgid "This table displays all users, in the selected tree."
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:835
-msgid "GOsa"
-msgstr ""
+#: plugins/admin/users/class_divListUsers.inc:60
+msgid "Select to see template pseudo users"
+msgstr "Выберите, чтобы просмотреть шаблоны псевдопользователей"
 
-#: plugins/admin/users/class_userManagement.inc:836
+#: plugins/admin/users/class_divListUsers.inc:60
+#: plugins/admin/fai/class_divListFai.inc:69
+msgid "Show templates"
+msgstr "Показать шаблоны"
+
+#: plugins/admin/users/class_divListUsers.inc:61
+#, fuzzy
+msgid "Select to see users that have only a GOsa object"
+msgstr ""
+"Выберите, чтобы просмотреть пользователей, у которых есть только объект GOsa"
+
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Show functional users"
+msgstr "Показать обычных пользователей"
+
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Select to see users that have posix settings"
+msgstr ""
+"Выберите, чтобы просмотреть пользователей с атрибутами в стандарте POSIX"
+
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Show unix users"
+msgstr "Показать UNIX-пользователей"
+
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Select to see users that have mail settings"
+msgstr "Выберите, чтобы просмотреть пользователей с настройками почты"
+
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Show mail users"
+msgstr "Показать пользователей с почтой"
+
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Select to see users that have samba settings"
+msgstr "Выберите, чтобы просмотреть пользователей с настройками Samba"
+
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Show samba users"
+msgstr "Показать пользователей Samba"
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Select to see users that have proxy settings"
+msgstr "Выберите, чтобы просмотреть пользователей с настройками прокси-сервера"
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Show proxy users"
+msgstr "Показать пользователей с прокси-серверами"
+
+#: plugins/admin/users/class_divListUsers.inc:110
+#, fuzzy
+msgid "Create new user"
+msgstr "Создание нового объекта в"
+
+#: plugins/admin/users/class_divListUsers.inc:110
+#, fuzzy
+msgid "New user"
+msgstr "пользователи"
+
+#: plugins/admin/users/class_divListUsers.inc:112
+#, fuzzy
+msgid "Create new template"
+msgstr "Создать шаблон"
+
+#: plugins/admin/users/class_divListUsers.inc:112
+msgid "New template"
+msgstr "Создать шаблон"
+
+#: plugins/admin/users/class_divListUsers.inc:159
+msgid "GOsa"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:160
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:838
+#: plugins/admin/users/class_divListUsers.inc:162
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:840
+#: plugins/admin/users/class_divListUsers.inc:164
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:842
+#: plugins/admin/users/class_divListUsers.inc:166
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:844
+#: plugins/admin/users/class_divListUsers.inc:168
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:846
+#: plugins/admin/users/class_divListUsers.inc:170
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:848
+#: plugins/admin/users/class_divListUsers.inc:172
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:849
+#: plugins/admin/users/class_divListUsers.inc:174
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Изменить свойства"
+
+#: plugins/admin/users/class_divListUsers.inc:175
 #, fuzzy
 msgid "Create user from template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_divListUsers.inc:176
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:908
+#: plugins/admin/users/class_divListUsers.inc:223
+#, fuzzy
+msgid "password"
+msgstr "Пароль"
+
+#: plugins/admin/users/class_divListUsers.inc:246
 #, fuzzy
 msgid "Online"
 msgstr "в сети"
 
-#: plugins/admin/users/class_userManagement.inc:915
+#: plugins/admin/users/class_divListUsers.inc:253
 #, fuzzy
 msgid "Offline"
 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:925
-msgid "Template"
-msgstr "Шаблон"
-
-#: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:334
-#: plugins/admin/fai/class_faiManagement.inc:445
-#: plugins/admin/fai/class_faiManagement.inc:612
-#: plugins/admin/fai/faiPackageNew.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/altlinux/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/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Управление пользователями"
-
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Список приложений"
-
-#: plugins/admin/applications/headpage.tpl:24
-#, 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/headpage.tpl:30
-#: plugins/admin/fai/headpage.tpl:29
-#, fuzzy
-msgid "Branches"
-msgstr "Отмена"
-
-#: plugins/admin/applications/headpage.tpl:36
-#: plugins/admin/fai/headpage.tpl:35
-#, fuzzy
-msgid "Current release"
-msgstr "Текущий пароль"
-
-#: plugins/admin/applications/headpage.tpl:56
-msgid "Display applications matching"
-msgstr "Шаблон для приложений"
-
-#: plugins/admin/applications/headpage.tpl:59
-msgid "Regular expression for matching application names"
-msgstr "Регулярное выражение, соответствующее именам приложений"
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:417
-#: plugins/admin/applications/class_applicationManagement.inc:524
+#: plugins/admin/applications/class_applicationGeneric.inc:450
+#: plugins/admin/applications/class_divListApplication.inc:51
 msgid "Application name"
 msgstr "Приложение"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Отображаемое имя"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:422
+#: plugins/admin/applications/class_applicationGeneric.inc:455
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 "Имя приложения, которое будет показано пользователям (например, под "
 "пиктограммами)"
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:110 plugins/admin/systems/server.tpl:49
-#: plugins/admin/systems/workstation.tpl:89
-#: plugins/admin/ogroups/termgroup.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:489
+#: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
+#: plugins/admin/systems/workstation.tpl:103
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/ogroups/termgroup.tpl:85
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
 msgstr "Выполнить"
@@ -5736,43 +7148,53 @@ msgid "Path and/or binary name of application"
 msgstr "Путь и/или имя исполняемого файла приложения"
 
 #: plugins/admin/applications/generic.tpl:34
+#: plugins/admin/mimetypes/generic.tpl:40
 msgid "Choose subtree to place application in"
 msgstr "Выберите ветку, куда нужно поместить приложение"
 
-#: plugins/admin/applications/generic.tpl:49
+#: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Пиктограмма"
 
-#: plugins/admin/applications/generic.tpl:57
+#: plugins/admin/applications/generic.tpl:63
+#: plugins/admin/mimetypes/generic.tpl:66
 msgid "Update"
 msgstr "Обновить"
 
-#: plugins/admin/applications/generic.tpl:57
+#: plugins/admin/applications/generic.tpl:63
 msgid "Reload picture from LDAP"
 msgstr "Обновить изображение с LDAP"
 
-#: plugins/admin/applications/generic.tpl:71
+#: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Разрешено для выполнения только членам группы"
 
-#: plugins/admin/applications/generic.tpl:73
+#: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Заменять настройки пользователя при запуске"
 
-#: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Помещать пиктограмму на рабочие столы членов группы"
 
-#: plugins/admin/applications/generic.tpl:80
+#: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
 
-#: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 #, fuzzy
 msgid "Place entry in members launch bar"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
 
-#: plugins/admin/applications/generic.tpl:96
+#: plugins/admin/applications/generic.tpl:102
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
@@ -5780,6 +7202,16 @@ msgstr "Помещать членам группы соответствующи
 msgid "Upload"
 msgstr "Загрузка процессора"
 
+#: plugins/admin/applications/generic.tpl:103
+#: plugins/admin/fai/class_faiScript.inc:251
+#: plugins/admin/fai/class_faiTemplate.inc:224
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:274
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+#, fuzzy
+msgid "Download"
+msgstr "Домен"
+
 #: plugins/admin/applications/class_applicationParameters.inc:52
 msgid "Remove options"
 msgstr "Удалить параметры"
@@ -5802,6 +7234,7 @@ msgstr ""
 "его, щелкнув ниже."
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Переменная"
 
@@ -5814,12 +7247,24 @@ msgstr "По умолчанию"
 msgid "Add option"
 msgstr "Добавить параметр"
 
+#: plugins/admin/applications/class_applicationParameters.inc:128
+#, fuzzy, php-format
+msgid "Removing of application parameters with dn '%s' 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/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+#: plugins/admin/applications/class_applicationParameters.inc:190
+#, fuzzy, php-format
+msgid "Saving of application parameters with dn '%s' failed."
+msgstr "Изменить дополнительные параметры приложения"
+
+#: plugins/admin/applications/remove.tpl:6
+#: plugins/admin/mimetypes/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+#: ihtml/themes/default/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for GOsa to get your data back."
@@ -5828,8 +7273,8 @@ msgstr ""
 "действительно ли вы хотите удалить его, так как GOsa не сможет отменить "
 "результаты этой операции."
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
+#: plugins/admin/applications/main.inc:39
+#: plugins/admin/applications/main.inc:41
 msgid "Application management"
 msgstr "Управление приложениями"
 
@@ -5842,83 +7287,130 @@ msgstr "не полный"
 msgid "This 'dn' is no application."
 msgstr "Это DN соответствует не приложению."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:231
+#: plugins/admin/applications/class_applicationGeneric.inc:203
+#, fuzzy, php-format
+msgid "Removing of application with dn '%s' failed."
+msgstr "Показать группы приложений"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:215
+#, php-format
+msgid "Removing application from objectgroup '%s' failed"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:222
+#, fuzzy, php-format
+msgid "Removing application from group '%s' failed"
+msgstr "Показать группы приложений"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:264
 msgid "The specified picture has not been uploaded correctly."
 msgstr "Указанное изображение было загружено некорректно."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:307
+#: plugins/admin/applications/class_applicationGeneric.inc:340
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:321
+#: plugins/admin/applications/class_applicationGeneric.inc:354
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr "У вас недостаточно прав для создания приложения в этой ветке."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:326
+#: plugins/admin/applications/class_applicationGeneric.inc:359
 msgid "Required field 'Name' is not filled."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:330
+#: plugins/admin/applications/class_applicationGeneric.inc:363
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:334
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Execute' is not filled."
 msgstr "Обязательное поле \"Выполнить\" не заполнено."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:349
-#: plugins/admin/applications/class_applicationGeneric.inc:357
+#: plugins/admin/applications/class_applicationGeneric.inc:382
+#: plugins/admin/applications/class_applicationGeneric.inc:390
 msgid "There's already an application with this 'Name'."
 msgstr "Приложение с таким именем уже существует."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:413
+#: plugins/admin/applications/class_applicationGeneric.inc:421
+#, fuzzy, php-format
+msgid "Saving of application with dn '%s' failed."
+msgstr "Приложение"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:446
 #, fuzzy
 msgid "Application settings"
 msgstr "Параметры приложения"
 
-#: plugins/admin/applications/class_applicationManagement.inc:379
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Приложение"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Путь к сценариям"
+
+#: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Вы собираетесь удалить приложение \"%s\"."
 
-#: plugins/admin/applications/class_applicationManagement.inc:385
-#: plugins/admin/applications/class_applicationManagement.inc:411
+#: plugins/admin/applications/class_applicationManagement.inc:295
+#: plugins/admin/applications/class_applicationManagement.inc:324
 msgid "You are not allowed to delete this application!"
 msgstr "У вас недостаточно прав для удаления этого приложения!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
-#: plugins/admin/ogroups/class_ogroupManagement.inc:457
+#: plugins/admin/applications/class_divListApplication.inc:31
 #, fuzzy
-msgid "new"
-msgstr "СоздаÑ\82Ñ\8c"
+msgid "List of Applications"
+msgstr "СпиÑ\81ок пÑ\80иложений"
 
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_divListApplication.inc:32
 #, fuzzy
-msgid "Create new application"
-msgstr "Создать приложения"
-
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Список подразделений"
+msgid "This table displays all applications in the selected tree."
+msgstr "Приложение с таким именем уже существует."
 
-#: plugins/admin/departments/headpage.tpl:24
+#: plugins/admin/applications/class_divListApplication.inc:36
 #, 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 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 ""
 "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"подразделения. Если у вас достаточно большое количество подразделений, вы "
-"можеÑ\82е иÑ\81полÑ\8cзоваÑ\82Ñ\8c гÑ\80Ñ\83пповое вÑ\8bделение."
+"приложения. Если у вас достаточно большое количество приложений, вы можете "
+"использовать групповое выделение."
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
-msgstr "Шаблон для подразделений"
+#: plugins/admin/applications/class_divListApplication.inc:108
+#: plugins/admin/ogroups/class_divListOGroup.inc:115
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
+#, fuzzy
+msgid "new"
+msgstr "Создать"
 
-#: plugins/admin/departments/headpage.tpl:42
-msgid "Regular expression for matching department names"
-msgstr "Регулярное выражение, соответствующее именам подразделений"
+#: plugins/admin/applications/class_divListApplication.inc:109
+#, fuzzy
+msgid "Create new application"
+msgstr "Создать приложения"
+
+#: plugins/admin/applications/release_select.tpl:3
+#: plugins/admin/fai/branch_selector.tpl:3
+#: plugins/admin/mimetypes/release_select.tpl:3
+#, fuzzy
+msgid "Branches"
+msgstr "Отмена"
+
+#: plugins/admin/applications/release_select.tpl:9
+#: plugins/admin/fai/branch_selector.tpl:9
+#: plugins/admin/mimetypes/release_select.tpl:9
+#, fuzzy
+msgid "Current release"
+msgstr "Текущий пароль"
 
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
@@ -5929,11 +7421,12 @@ msgid "Name of subtree to create"
 msgstr "Имя создаваемой ветки"
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:61
 msgid "Descriptive text for department"
 msgstr "Описание подразделения"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Категория"
 
@@ -5942,35 +7435,45 @@ msgid "Category for this subtree"
 msgstr "Категория этой ветки"
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:122
+#: plugins/gofon/conference/generic.tpl:127
 msgid "Choose subtree to place department in"
 msgstr "Выберите ветку для подразделения"
 
-#: plugins/admin/departments/generic.tpl:48
+#: plugins/admin/departments/generic.tpl:52
 msgid "State where this subtree is located"
 msgstr "Адм. единица, в которой находится ветка"
 
-#: plugins/admin/departments/generic.tpl:52
+#: plugins/admin/departments/generic.tpl:56
 msgid "Location of this subtree"
 msgstr "Местоположение ветки"
 
-#: plugins/admin/departments/generic.tpl:56
+#: plugins/admin/departments/generic.tpl:60
 msgid "Postal address of this subtree"
 msgstr "Почтовый адрес для ветки"
 
-#: plugins/admin/departments/generic.tpl:60
+#: plugins/admin/departments/generic.tpl:64
 msgid "Base telephone number of this subtree"
 msgstr "Основный телефонный номер для ветки"
 
-#: plugins/admin/departments/generic.tpl:64
+#: plugins/admin/departments/generic.tpl:68
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Основный номер факса для ветки"
 
-#: plugins/admin/departments/tabs_department.inc:31
-#: 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/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
+#, fuzzy
+msgid "Administrative settings"
+msgstr "Администрирование"
+
+#: plugins/admin/departments/generic.tpl:83
+msgid "Tag department as an independent administrative unit"
+msgstr ""
+
+#: plugins/admin/departments/tabs_department.inc:34
+#: plugins/admin/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -5987,7 +7490,8 @@ msgstr ""
 "так как GOsa не сможет отменить результаты этой операции."
 
 #: plugins/admin/departments/remove.tpl:10 plugins/admin/systems/remove.tpl:10
-#: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:10
+#: plugins/admin/acl/remove.tpl:10 plugins/admin/fai/remove.tpl:11
+#: plugins/gofon/conference/remove.tpl:10
 #, fuzzy
 msgid ""
 "Best thing to do before performing this action would be to save the current "
@@ -5998,101 +7502,152 @@ msgstr ""
 "файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
 "<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested 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/dep_iframe.tpl:8
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
 msgid "Department management"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:186
+#: plugins/admin/departments/class_departmentGeneric.inc:172
+#, fuzzy, php-format
+msgid "Removing of department with dn '%s' failed."
+msgstr "Показать подразделения"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:193
-#: plugins/admin/departments/class_departmentGeneric.inc:195
+#: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:203
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "Обязательное поле \"Описание\" не заполнено."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/departments/class_departmentGeneric.inc:242
+#, fuzzy, php-format
+msgid ""
+"The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:209
-msgid " Please choose another name."
-msgstr " Введите другое имя."
+#: plugins/admin/departments/class_departmentGeneric.inc:294
+msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:340
+#, fuzzy, php-format
+msgid "Saving of department with dn '%s' failed."
+msgstr "Показать подразделения"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:382
+#, php-format
+msgid "Tagging '%s'."
+msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:279
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
-msgid "Moving %s to %s"
+msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:318
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:490
+#: ihtml/themes/default/snapshotdialog.tpl:14
+#: ihtml/themes/default/snapshotdialog.tpl:54
+msgid "Object"
+msgstr "Объект"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Подразделения"
 
-#: plugins/admin/departments/class_departmentManagement.inc:189
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:181
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Телефон"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+#, fuzzy
+msgid "Department name"
+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:206
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:196
+#: 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:301
-#: plugins/admin/fai/class_faiManagement.inc:648
-#, fuzzy
-msgid "Go to users home department"
-msgstr "Подразделение"
+#: plugins/admin/departments/class_departmentManagement.inc:334
+msgid ".."
+msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:304
-#, fuzzy
-msgid "Create new department"
-msgstr "Ð\9fодÑ\80азделение"
+#: plugins/admin/departments/class_divListDepartment.inc:27
+#: plugins/admin/departments/class_divListDepartment.inc:28
+msgid "List of departments"
+msgstr "СпиÑ\81ок подÑ\80азделений"
 
-#: plugins/admin/departments/class_departmentManagement.inc:312
-msgid "This table displays all departments, in the selected tree."
+#: plugins/admin/departments/class_divListDepartment.inc:33
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large number of departments, you might prefer the range selectors on top "
+"of the department list."
 msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"подразделения. Если у вас достаточно большое количество подразделений, вы "
+"можете использовать групповое выделение."
 
-#: plugins/admin/departments/class_departmentManagement.inc:321
-#, fuzzy
-msgid "Department name"
-msgstr "Управление подразделениями"
-
-#: plugins/admin/departments/class_departmentManagement.inc:417
-msgid ".."
-msgstr ""
-
-#: plugins/admin/departments/recursive_move.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr ""
+#: plugins/admin/departments/class_divListDepartment.inc:49
+msgid "Regular expression for matching department names"
+msgstr "Регулярное выражение, соответствующее именам подразделений"
 
-#: plugins/admin/departments/recursive_move.tpl:2
-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:71
+#: plugins/admin/fai/class_divListFai.inc:123
+#, fuzzy
+msgid "Go to users home department"
+msgstr "Подразделение"
 
-#: plugins/admin/departments/recursive_move.tpl:7
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
+#: plugins/admin/departments/class_divListDepartment.inc:74
+#, fuzzy
+msgid "Create new department"
+msgstr "Подразделение"
 
 #: plugins/admin/systems/network.tpl:1
 #, fuzzy
@@ -6107,76 +7662,84 @@ msgstr "IP-адрес"
 msgid "MAC-address"
 msgstr "MAC-адрес"
 
-#: plugins/admin/systems/network.tpl:29
+#: 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:30
+#: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/admin/fai/faiPackageNew.tpl:31
+#: plugins/gofon/phoneaccount/generic.tpl:68
 #, fuzzy
 msgid "Refresh"
 msgstr "Ссылки"
 
-#: plugins/admin/systems/network.tpl:34
+#: plugins/admin/systems/network.tpl:50
 #, fuzzy
 msgid "Zone"
 msgstr "телефоны"
 
-#: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:160
+#: plugins/admin/systems/network.tpl:58
+#: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:47
+#: plugins/admin/systems/network.tpl:63
 #, fuzzy
 msgid "Dns records"
 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_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:120
-#: plugins/admin/systems/class_terminalGeneric.inc:153
-#: plugins/admin/systems/class_workstationStartup.inc:401
-#: plugins/admin/systems/class_workstationService.inc:151
+#: plugins/admin/systems/class_terminalInfo.inc:67
+#: plugins/admin/systems/class_terminalService.inc:252
+#: plugins/admin/systems/class_terminalStartup.inc:151
+#: plugins/admin/systems/class_terminalGeneric.inc:230
+#: plugins/admin/systems/class_workstationStartup.inc:456
+#: plugins/admin/systems/class_workstationService.inc:241
 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 "не в сети"
 
@@ -6186,40 +7749,43 @@ msgid "Time Service"
 msgstr "Сервисы"
 
 #: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/class_goLdapServer.inc:47
 #, fuzzy
 msgid "LDAP Service"
 msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 #, fuzzy
 msgid "Terminal Service"
 msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
+#: plugins/admin/systems/goTerminalServer.tpl:6
 #, fuzzy
 msgid "Temporary disable login"
 msgstr "Временно отключить использование факса"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
+#: plugins/admin/systems/goTerminalServer.tpl:9
 #, fuzzy
 msgid "Font path"
 msgstr "Контакт"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
+#: plugins/admin/systems/goSyslogServer.tpl:1
 #, fuzzy
 msgid "Syslog Service"
 msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
+#: plugins/admin/systems/goCupsServer.tpl:1
 #, fuzzy
 msgid "Print Service"
 msgstr "Служба печати"
 
-#: plugins/admin/systems/servservice.tpl:109
-#, fuzzy
-msgid "Mail server"
-msgstr "Сервер"
-
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
 msgstr "Системная информация"
@@ -6304,6 +7870,8 @@ msgid "SSH service"
 msgstr "Служба SSH"
 
 #: plugins/admin/systems/info.tpl:119
+#: plugins/admin/systems/class_goCupsServer.inc:26
+#: plugins/admin/systems/class_goCupsServer.inc:46
 msgid "Print service"
 msgstr "Служба печати"
 
@@ -6325,155 +7893,369 @@ msgstr "Графический интерфейс"
 msgid "This 'dn' has no network features."
 msgstr "Этот DN не имеет свойств принтера."
 
+#: plugins/admin/systems/class_winGeneric.inc:126
+#, php-format
+msgid "Removing of system wingeneric/generic with dn '%s' failed."
+msgstr ""
+
 #: plugins/admin/systems/class_winGeneric.inc:164
-#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_componentGeneric.inc:155
 #, fuzzy
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
 #: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:288
-#: plugins/admin/systems/class_servGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:247
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_phoneGeneric.inc:318
-#: plugins/admin/systems/class_printGeneric.inc:600
+#: plugins/admin/systems/class_terminalGeneric.inc:391
+#: plugins/admin/systems/class_servGeneric.inc:242
+#: plugins/admin/systems/class_workstationGeneric.inc:361
+#: plugins/admin/systems/class_printGeneric.inc:619
+#: plugins/admin/systems/class_componentGeneric.inc:165
+#: 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_winGeneric.inc:224
+#, php-format
+msgid "Saving of system wingeneric/generic with dn '%s' failed."
+msgstr ""
+
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr "Управление системами"
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr "Терминал"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Выберите ветку терминала"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
+#: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
+#: plugins/admin/systems/phonesettings.tpl:23
+#: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Режим"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/terminal.tpl:36 plugins/admin/systems/server.tpl:34
+#: plugins/admin/systems/workstation.tpl:41
+#: plugins/admin/ogroups/termgroup.tpl:40
 msgid "Select terminal mode"
 msgstr "Выберите режим терминала"
 
-#: plugins/admin/systems/terminal.tpl:53
+#: plugins/admin/systems/terminal.tpl:42
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
+msgid "Syslog server"
+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/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Основной сервер"
 
-#: plugins/admin/systems/terminal.tpl:55
+#: plugins/admin/systems/terminal.tpl:61
 msgid "Select NFS root filesystem to use"
 msgstr "Выберите корневую файловую систему NFS"
 
-#: plugins/admin/systems/terminal.tpl:61
+#: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/terminal.tpl:63
+#: plugins/admin/systems/terminal.tpl:69
 msgid "Choose NFS filesystem to place swap files on"
 msgstr "Выберите файловую систему NFS для файлов подкачки"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Сервер системных журналов"
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Выберите сервер для ведения системных журналов"
+#: plugins/admin/systems/terminal.tpl:86
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Inherit time server attributes"
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
+#: 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/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
+#: 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:100 plugins/admin/systems/server.tpl:39
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/terminal.tpl:115 plugins/admin/systems/server.tpl:50
+#: 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:3
+#: plugins/admin/ogroups/termgroup.tpl:75
 msgid "Action"
 msgstr "Действие"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
+#: 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_terminalService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+#, fuzzy
+msgid "unknown"
+msgstr "состояние неизвестно"
+
+#: plugins/admin/systems/class_terminalService.inc:72
+#: plugins/admin/systems/class_terminalService.inc:100
+#: plugins/admin/systems/class_terminalService.inc:106
+#: plugins/admin/systems/class_terminalService.inc:116
+#: 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_terminalStartup.inc:39
+#: plugins/admin/systems/class_terminalStartup.inc:111
+#: plugins/admin/systems/class_terminalStartup.inc:131
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_terminalGeneric.inc:280
+#: plugins/admin/systems/class_workstationGeneric.inc:118
+#: plugins/admin/systems/class_workstationStartup.inc:266
+#: plugins/admin/systems/class_workstationStartup.inc:284
+#: plugins/admin/systems/class_workstationStartup.inc:288
+#: plugins/admin/systems/class_workstationStartup.inc:758
+#: 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
+msgid "inherited"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:101
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: 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_terminalService.inc:155
 msgid "default"
 msgstr "по умолчанию"
 
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:138
 msgid "show chooser"
 msgstr "показать окно входа в систему"
 
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:139
 msgid "direct"
 msgstr "напрямую"
 
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:142
 msgid "load balanced"
 msgstr "с выравниваем нагрузки"
 
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_workstationService.inc:145
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:146
 msgid "ICA client"
 msgstr "Клиент ICA"
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: 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_terminalService.inc:271
-#: plugins/admin/systems/class_terminalService.inc:276
-#: plugins/admin/systems/class_workstationService.inc:264
-#: plugins/admin/systems/class_workstationService.inc:269
+#: plugins/admin/systems/class_terminalService.inc:365
+#: plugins/admin/systems/class_terminalService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:359
+#: plugins/admin/systems/class_workstationService.inc:364
 msgid "Please specify a valid VSync range."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/admin/systems/class_terminalService.inc:286
-#: plugins/admin/systems/class_terminalService.inc:291
-#: plugins/admin/systems/class_workstationService.inc:279
-#: plugins/admin/systems/class_workstationService.inc:284
+#: plugins/admin/systems/class_terminalService.inc:380
+#: plugins/admin/systems/class_terminalService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:374
+#: plugins/admin/systems/class_workstationService.inc:379
 msgid "Please specify a valid HSync range."
 msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
 
-#: plugins/admin/systems/class_terminalStartup.inc:91
-#: plugins/admin/systems/class_workstationStartup.inc:232
+#: plugins/admin/systems/class_terminalService.inc:416
+#, fuzzy, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr "Информация об организации"
+
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+#, fuzzy
+msgid "Service"
+msgstr "Сервисы"
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#, fuzzy
+msgid "Terminal service"
+msgstr "Терминальный сервер"
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+#, fuzzy
+msgid "Monitor"
+msgstr "Мониторинг"
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "Почтовые настройки"
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Удаленная рабочая станция"
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Разрешение"
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Глубина цвета"
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+#, fuzzy
+msgid "Hsync"
+msgstr "Строчная синхронизация"
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+#, fuzzy
+msgid "Vsync"
+msgstr "Кадровая синхронизация"
+
+#: plugins/admin/systems/class_terminalService.inc:443
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Сервер для хранения запросов и временных файлов"
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "отключен"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+#, fuzzy
+msgid "Scanner model"
+msgstr "отключен"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Выберите модель клавиатуры"
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Выберите раскладку"
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Выберите вариант раскладки"
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+#, fuzzy
+msgid "Mouse type"
+msgstr "Тип"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Mouse port"
+msgstr "Мониторинг"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Телефонное оборудование"
+
+#: plugins/admin/systems/class_terminalStartup.inc:93
+#: plugins/admin/systems/class_workstationStartup.inc:309
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -6481,11 +8263,40 @@ msgid ""
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
+#: plugins/admin/systems/class_terminalStartup.inc:386
+#, fuzzy, php-format
+msgid "Saving of system terminal/startup with dn '%s' failed."
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Шаблон терминала"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Ядро для загрузки"
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Изменить параметры"
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr "Имя сервера"
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:54
 #, fuzzy
 msgid "Select action to execute for this server"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
@@ -6494,18 +8305,6 @@ msgstr "Выберите действие, которое нужно выпол
 msgid "Phone name"
 msgstr "Название"
 
-#: plugins/admin/systems/class_servService.inc:273
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Шаблон рабочей станции"
-
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Имя рабочий станции"
-
 #: plugins/admin/systems/printer.tpl:6
 #, fuzzy
 msgid "General"
@@ -6515,512 +8314,570 @@ msgstr "Общее"
 msgid "Printer name"
 msgstr "Имя принтера"
 
-#: plugins/admin/systems/printer.tpl:31
+#: plugins/admin/systems/printer.tpl:36
 msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
+#: plugins/admin/systems/printer.tpl:39
 #, fuzzy
 msgid "Printer location"
 msgstr "Настройки телефона"
 
-#: plugins/admin/systems/printer.tpl:38
+#: plugins/admin/systems/printer.tpl:43
 msgid "Printer URL"
 msgstr "URL принтера"
 
-#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/systems/printer.tpl:51
 #: plugins/admin/systems/workstationService.tpl:86
 #: plugins/admin/systems/terminalService.tpl:86
 msgid "Driver"
 msgstr "Драйвер"
 
-#: plugins/admin/systems/printer.tpl:58
-#, fuzzy
-msgid "Permissions"
-msgstr "Права для членов группы"
-
-#: plugins/admin/systems/printer.tpl:65
+#: plugins/admin/systems/printer.tpl:70
 #, fuzzy
 msgid "Users which are allowed to use this printer"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
 #, fuzzy
 msgid "Add user"
 msgstr "Пользователи домена"
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
 #, fuzzy
 msgid "Add group"
 msgstr "группы"
 
-#: plugins/admin/systems/printer.tpl:81
+#: plugins/admin/systems/printer.tpl:86
 #, fuzzy
 msgid "Users which are allowed to administrate this printer"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/printer.tpl:82
+#: plugins/admin/systems/printer.tpl:87
 #, fuzzy
 msgid "Admins"
 msgstr "DN администратора"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
+msgstr "Шаблон рабочей станции"
+
+#: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
+msgid "Workstation name"
+msgstr "Имя рабочий станции"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:98
 msgid "text"
 msgstr "текст"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:99
 msgid "graphic"
 msgstr "графика"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
+#: plugins/admin/systems/class_terminalGeneric.inc:161
+#, php-format
+msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:167
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "Определение WAKECMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/ogroups/class_termgroup.inc:68
-#: plugins/admin/ogroups/class_termgroup.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:92
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr "Ошибка при выполнении \"%s\"!"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
+#: plugins/admin/systems/class_terminalGeneric.inc:179
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "Определение REBOOTCMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
+#: plugins/admin/systems/class_terminalGeneric.inc:191
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:262
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/ogroups/class_termgroup.inc:249
 msgid "Switch off"
 msgstr "Выключить"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:263
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/ogroups/class_termgroup.inc:249
 msgid "Reboot"
 msgstr "Перезагрузить"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:264
+#: plugins/admin/systems/class_terminalGeneric.inc:268
+#: plugins/admin/systems/class_servGeneric.inc:166
+#: plugins/admin/systems/class_servGeneric.inc:172
+#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_workstationGeneric.inc:257
+#: plugins/admin/ogroups/class_termgroup.inc:254
+#, fuzzy
+msgid "Memory test"
+msgstr "Память"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:265
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+#: plugins/admin/systems/class_servGeneric.inc:167
+#: plugins/admin/systems/class_servGeneric.inc:173
+#: plugins/admin/systems/class_workstationGeneric.inc:252
+#: plugins/admin/systems/class_workstationGeneric.inc:258
+#: plugins/admin/ogroups/class_termgroup.inc:255
+#, fuzzy
+msgid "System analysis"
+msgstr "Системные журналы"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:267
+#: plugins/admin/systems/class_servGeneric.inc:169
+#: plugins/admin/systems/class_workstationGeneric.inc:254
 msgid "Wake up"
 msgstr "Вернуть в обычный режим"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:319
+#, php-format
+msgid "Removing of object system terminal/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:374
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr "У вас недостаточно прав для создания терминала в этой ветке."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_terminalGeneric.inc:378
 msgid "The required field 'Terminal name' is not set."
 msgstr "Обязательное поле 'Название терминала' не заполнено."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-#, fuzzy
-msgid "This 'dn' has no server features."
-msgstr "Этот DN не имеет свойств принтера."
+#: plugins/admin/systems/class_terminalGeneric.inc:401
+#: plugins/admin/systems/class_workstationGeneric.inc:371
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:193
-#, fuzzy
-msgid "The required field 'Server name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
+#: plugins/admin/systems/class_terminalGeneric.inc:476
+#, php-format
+msgid "Saving of object system terminal/generic with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
 #, 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 "Terminal"
+msgstr "ТеÑ\80миналÑ\8b"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Удалить сервис DHCP"
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/class_servDHCP.inc:37
+#: plugins/admin/systems/class_terminalGeneric.inc:499
 #, fuzzy
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+msgid "Syslog server enabled"
+msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "Добавить сервис DHCP"
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Почтовые настройки пользователя"
 
-#: plugins/admin/systems/class_servDHCP.inc:40
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
 #, fuzzy
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Action flag"
+msgstr "Действие"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:43
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/ogroups/class_termgroup.inc:45
 #, fuzzy
 msgid "Activated"
 msgstr "Личный"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:72
+#: plugins/admin/systems/class_servGeneric.inc:67
 #, fuzzy
-msgid "Memory test"
-msgstr "Память"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-#, fuzzy
-msgid "System analysis"
-msgstr "Системные журналы"
+msgid "This 'dn' has no server features."
+msgstr "Этот DN не имеет свойств принтера."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_workstationGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:162
 #, fuzzy
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
-msgstr "Это DN не содержит атрибутоов рабочей станции."
+#: plugins/admin/systems/class_servGeneric.inc:111
+#, php-format
+msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
+#: plugins/admin/systems/class_servGeneric.inc:162
+#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/ogroups/class_termgroup.inc:250
 #, fuzzy
 msgid "Instant update"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
+#: plugins/admin/systems/class_servGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:171
+#: plugins/admin/systems/class_workstationGeneric.inc:248
+#: plugins/admin/systems/class_workstationGeneric.inc:256
+#: plugins/admin/ogroups/class_termgroup.inc:251
 #, fuzzy
 msgid "Scheduled update"
 msgstr "Выберите режим терминала"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:164
+#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/systems/class_workstationGeneric.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:255
+#: plugins/admin/ogroups/class_termgroup.inc:252
 msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
+#: plugins/admin/systems/class_servGeneric.inc:165
+#: plugins/admin/systems/class_workstationGeneric.inc:250
+#: plugins/admin/ogroups/class_termgroup.inc:253
 #, fuzzy
 msgid "Rescan hardware"
 msgstr "Телефонное оборудование"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:230
+#: plugins/admin/systems/class_servGeneric.inc:188
+#, fuzzy, php-format
+msgid "Removing of system server/generic with dn '%s' failed."
+msgstr "Удалить учетную запись POSIX"
+
+#: plugins/admin/systems/class_servGeneric.inc:224
+#, fuzzy
+msgid "The required field 'Server name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
+
+#: plugins/admin/systems/class_servGeneric.inc:231
+#, fuzzy
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/admin/systems/class_servGeneric.inc:300
+#, php-format
+msgid "Saving of system server/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "в папку"
+
+#: 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/class_workstationGeneric.inc:174
+#: plugins/admin/ogroups/class_termgroup.inc:205
+#, fuzzy, php-format
+msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
+msgstr "Шаблон рабочей станции"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:184
+msgid "This 'dn' has no workstation features."
+msgstr "Это DN не содержит атрибутоов рабочей станции."
+
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#, fuzzy, php-format
+msgid "Removing of system workstation/generic with dn '%s' failed."
+msgstr "Удалить учетную запись Samba"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:344
+#: plugins/admin/ogroups/class_termgroup.inc:113
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:234
+#: plugins/admin/systems/class_workstationGeneric.inc:348
 msgid "The required field 'Workstation name' is not set."
 msgstr "Обязательное поле 'Название рабочей станции' не заполнено."
 
+#: plugins/admin/systems/class_workstationGeneric.inc:438
+#: plugins/admin/systems/class_workstationGeneric.inc:456
+#, fuzzy, php-format
+msgid "Saving of system workstation/generic with dn '%s' failed."
+msgstr "Дополнительные записи в fstab"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Имя рабочий станции"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Рабочая станция"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "Сервер NTP"
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr "Системы"
 
-#: plugins/admin/systems/class_systemManagement.inc:435
+#: plugins/admin/systems/class_systemManagement.inc:211
 msgid "You can't edit this object type yet!"
 msgstr "Вы не можете редактировать сейчас этот тип объекта!"
 
-#: plugins/admin/systems/class_systemManagement.inc:461
+#: plugins/admin/systems/class_systemManagement.inc:236
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "Введенные пароли не совпадают!"
 
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:253
 msgid "You are not allowed to set this systems password!"
 msgstr "У вас недостаточно прав для смены пароля этой системы!"
 
-#: plugins/admin/systems/class_systemManagement.inc:532
+#: 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:538
-#: plugins/admin/systems/class_systemManagement.inc:609
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
+#: plugins/admin/systems/class_systemManagement.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:373
+#: plugins/admin/fai/class_faiManagement.inc:160
+#: plugins/admin/fai/class_faiManagement.inc:211
 #, fuzzy
 msgid "You are not allowed to delete this component!"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#, fuzzy
-msgid "New Terminal template"
-msgstr "Шаблон терминала"
-
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:932
-#, fuzzy
-msgid "New Terminal"
+#: plugins/admin/systems/class_systemManagement.inc:648
+msgid "New terminal"
 msgstr "Создать терминал"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#, fuzzy
-msgid "New Workstation template"
-msgstr "Шаблон рабочей станции"
-
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:933
-#, fuzzy
-msgid "New Workstation"
+#: plugins/admin/systems/class_systemManagement.inc:650
+msgid "New workstation"
 msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
-#, fuzzy
-msgid "New Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:652
 #, fuzzy
-msgid "New Printer"
-msgstr "Ð\9fÑ\80инÑ\82еÑ\80"
+msgid "New Device"
+msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
 
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/class_systemManagement.inc:667
 #, fuzzy
-msgid "New Phone"
-msgstr "ТелеÑ\84он"
+msgid "Terminal template for"
+msgstr "Шаблон Ñ\82еÑ\80минала"
 
-#: plugins/admin/systems/class_systemManagement.inc:776
-#: plugins/admin/systems/class_systemManagement.inc:777
-#, fuzzy
-msgid "New Component"
-msgstr "Прочие сетевые компоненты"
+#: plugins/admin/systems/class_systemManagement.inc:679
+msgid "Workstation template for"
+msgstr "Шаблон рабочей станции для"
 
-#: plugins/admin/systems/class_systemManagement.inc:787
+#: plugins/admin/systems/class_systemManagement.inc:767
 #, fuzzy
-msgid "Edit system"
-msgstr "СпиÑ\81ок Ñ\81иÑ\81Ñ\82ем"
+msgid "New System from incoming"
+msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
 
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/systems/class_systemManagement.inc:771
 #, fuzzy
-msgid "Delete system"
-msgstr "Удалить"
-
-#: plugins/admin/systems/class_systemManagement.inc:794
-#: plugins/admin/fai/class_faiManagement.inc:689
-msgid "This table displays all systems, in the selected tree."
-msgstr ""
+msgid "Workstation is installing"
+msgstr "Имя рабочий станции"
 
-#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_systemManagement.inc:772
 #, fuzzy
-msgid "System"
-msgstr "СиÑ\81Ñ\82емÑ\8b"
+msgid "Workstation is waiting for action"
+msgstr "Шаблон Ñ\80абоÑ\87ей Ñ\81Ñ\82анÑ\86ии длÑ\8f"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_systemManagement.inc:773
 #, fuzzy
-msgid "Cups Server"
-msgstr "СеÑ\80веÑ\80"
+msgid "Workstation installation failed"
+msgstr "Шаблон Ñ\80абоÑ\87ей Ñ\81Ñ\82анÑ\86ии"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Log Db"
+#: plugins/admin/systems/class_systemManagement.inc:776
+msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-#, fuzzy
-msgid "Syslog Server"
-msgstr "Сервер системных журналов"
-
-#: plugins/admin/systems/class_systemManagement.inc:839
-#, fuzzy
-msgid "Mail Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:840
-#, fuzzy
-msgid "Imap Server"
-msgstr "Сервер подкачки"
-
-#: plugins/admin/systems/class_systemManagement.inc:841
-#, fuzzy
-msgid "Nfs Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:842
-#, fuzzy
-msgid "Kerberos Server"
-msgstr "Kerberos"
-
-#: plugins/admin/systems/class_systemManagement.inc:843
-#, fuzzy
-msgid "Asterisk Server"
-msgstr "Терминальный сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:844
-#, fuzzy
-msgid "Fax Server"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_systemManagement.inc:845
-#, fuzzy
-msgid "Ldap Server"
-msgstr "Сервер подкачки"
-
-#: plugins/admin/systems/class_systemManagement.inc:878
-#, fuzzy
-msgid "Set root password"
-msgstr "Изменить пароль"
-
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_systemManagement.inc:777
 #, fuzzy
-msgid "New System from incoming"
-msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
+msgid "Server is waiting for action"
+msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:598
+#: plugins/admin/systems/class_systemManagement.inc:778
 #, fuzzy
-msgid "Terminal"
-msgstr "Терминалы"
-
-#: plugins/admin/systems/class_systemManagement.inc:927
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:597
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Рабочая станция"
+msgid "Server installation failed"
+msgstr "Номер дома"
 
-#: plugins/admin/systems/class_systemManagement.inc:930
+#: plugins/admin/systems/class_systemManagement.inc:779
 #, fuzzy
 msgid "Winstation"
 msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:931
+#: plugins/admin/systems/class_systemManagement.inc:780
 #, fuzzy
 msgid "Network Device"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/class_systemManagement.inc:1153
-msgid "New terminal"
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_divListSystem.inc:103
+#, fuzzy
+msgid "New Terminal"
 msgstr "Создать терминал"
 
-#: plugins/admin/systems/class_systemManagement.inc:1155
-msgid "New workstation"
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/systems/class_divListSystem.inc:105
+#, fuzzy
+msgid "New Workstation"
 msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:1157
+#: plugins/admin/systems/servdns.tpl:1
 #, fuzzy
-msgid "New Device"
-msgstr "Сетевые устройства"
+msgid "Zones"
+msgstr "телефоны"
 
-#: plugins/admin/systems/class_systemManagement.inc:1172
+#: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 #, fuzzy
-msgid "Terminal template for"
-msgstr "Шаблон терминала"
-
-#: plugins/admin/systems/class_systemManagement.inc:1184
-msgid "Workstation template for"
-msgstr "Шаблон рабочей станции для"
+msgid "Postfix mydomain"
+msgstr "в домене"
 
-#: plugins/admin/systems/servdns.tpl:1
+#: plugins/admin/systems/servkolab.tpl:16
 #, fuzzy
-msgid "Zones"
-msgstr "телефоны"
+msgid "Postfix mydestination"
+msgstr "Атрибуты UNIX"
 
-#: plugins/admin/systems/servkolab.tpl:14
+#: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 #, fuzzy
 msgid "POP3 service"
 msgstr "Служба печати"
 
-#: plugins/admin/systems/servkolab.tpl:22
+#: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 #, fuzzy
 msgid "POP3/SSL service"
 msgstr "Служба SSH"
 
-#: plugins/admin/systems/servkolab.tpl:30
+#: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 #, fuzzy
 msgid "IMAP service"
 msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/servkolab.tpl:38
+#: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 #, fuzzy
 msgid "IMAP/SSL service"
 msgstr "Служба SSH"
 
-#: plugins/admin/systems/servkolab.tpl:46
+#: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 #, fuzzy
 msgid "Sieve service"
 msgstr "Служба SSH"
 
-#: plugins/admin/systems/servkolab.tpl:54
+#: plugins/admin/systems/servkolab.tpl:73
 msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
+#: plugins/admin/systems/servkolab.tpl:81
 msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
+#: plugins/admin/systems/servkolab.tpl:89
 msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
+#: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 #, fuzzy
 msgid "Quota settings"
 msgstr "Настройки Samba"
 
-#: plugins/admin/systems/servkolab.tpl:97
+#: plugins/admin/systems/servkolab.tpl:116
 #, fuzzy
 msgid "Free/Busy settings"
 msgstr "Настройки факса"
 
-#: plugins/admin/systems/servkolab.tpl:102
+#: plugins/admin/systems/servkolab.tpl:121
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
+#: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
+#: plugins/admin/systems/servkolab.tpl:141
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:125
+#: plugins/admin/systems/servkolab.tpl:144
 msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
+#: plugins/admin/systems/servkolab.tpl:157
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
+#: plugins/admin/systems/servkolab.tpl:163
 msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
+#: plugins/admin/systems/servkolab.tpl:168
 msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
+#: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
+#: plugins/admin/systems/servkolab.tpl:188
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:67
+#: plugins/admin/systems/class_servDNS.inc:32
+#, fuzzy
+msgid "Domain name system service"
+msgstr "Сканер"
+
+#: plugins/admin/systems/class_servDNS.inc:73
 #: plugins/admin/systems/class_inventory.inc:36
 msgid "Remove DNS service"
 msgstr "Удалить сервис DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:68
+#: plugins/admin/systems/class_servDNS.inc:74
 #: plugins/admin/systems/class_inventory.inc:37
 #, fuzzy
 msgid ""
@@ -7029,12 +8886,12 @@ msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servDNS.inc:70
+#: plugins/admin/systems/class_servDNS.inc:76
 #: plugins/admin/systems/class_inventory.inc:39
 msgid "Add DNS service"
 msgstr "Добавить сервис DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:71
+#: plugins/admin/systems/class_servDNS.inc:77
 #: plugins/admin/systems/class_inventory.inc:40
 #, fuzzy
 msgid ""
@@ -7043,62 +8900,139 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servDNS.inc:159
+#: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 #, fuzzy
 msgid "Reverse zone"
 msgstr "Ссылки"
 
-#: plugins/admin/systems/class_servDNS.inc:161
+#: plugins/admin/systems/class_servDNS.inc:167
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
 #, fuzzy
 msgid "Class"
 msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/class_servDNS.inc:223
+#: plugins/admin/systems/class_servDNS.inc:229
 #, php-format
 msgid ""
 "Can't delete the selected zone, because it is still in use by these entry/"
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
+#: plugins/admin/systems/class_servDNS.inc:288
+#, php-format
+msgid "Updating of system server/dns with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:297
+#, fuzzy, php-format
+msgid "Removing of system server/dns with dn '%s' failed."
+msgstr "Удалить сервис DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:318
+#, fuzzy, php-format
+msgid "Saving of system server/dns with dn '%s' failed."
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/admin/systems/class_servDNS.inc:342
+#, php-format
+msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
+#: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 #, fuzzy
-msgid "Kerberos Realm"
-msgstr "Kerberos"
+msgid "DNS service"
+msgstr "Добавить сервис DNS"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
 #, fuzzy
-msgid "Admin user"
-msgstr "Пользователи домена"
+msgid "DNS"
+msgstr "DNS"
 
-#: plugins/admin/systems/servdb.tpl:26
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
 #, fuzzy
-msgid "FAX database"
-msgstr "Ð\91азÑ\8b даннÑ\8bÑ\85"
+msgid "Zone name"
+msgstr "Ð\9dазвание"
 
-#: plugins/admin/systems/servdb.tpl:30
+#: plugins/admin/systems/class_servDNS.inc:401
 #, fuzzy
-msgid "FAX DB user"
-msgstr "Ð\9fоказаÑ\82Ñ\8c полÑ\8cзоваÑ\82елей Ñ\84акÑ\81ов"
+msgid "Primary dns server"
+msgstr "Ð\9eÑ\81новной адÑ\80еÑ\81 Ñ\8dл. поÑ\87Ñ\82Ñ\8b длÑ\8f Ñ\8dÑ\82ой обÑ\89ей папки"
 
-#: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
 #, fuzzy
-msgid "Asterisk management"
-msgstr "Управление системами"
+msgid "Serial"
+msgstr "терминалы"
 
-#: plugins/admin/systems/servdb.tpl:46
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Повторить"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+#, fuzzy
+msgid "Expire"
+msgstr "Экспорт"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+#, fuzzy
+msgid "Zone records"
+msgstr "Каталог"
+
+#: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
+msgid "Kerberos kadmin access"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:10 plugins/admin/systems/goKrbServer.tpl:4
+#, fuzzy
+msgid "Kerberos Realm"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/goKrbServer.tpl:8
+#: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
+#, fuzzy
+msgid "Admin user"
+msgstr "Пользователи домена"
+
+#: plugins/admin/systems/servdb.tpl:26
+#, fuzzy
+msgid "FAX database"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/servdb.tpl:30 plugins/admin/systems/goFaxServer.tpl:4
+#, fuzzy
+msgid "FAX DB user"
+msgstr "Показать пользователей факсов"
+
+#: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/class_goFonServer.inc:52
+#, fuzzy
+msgid "Asterisk management"
+msgstr "Управление системами"
+
+#: plugins/admin/systems/servdb.tpl:46 plugins/admin/systems/goFonServer.tpl:4
 msgid "Asterisk DB user"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:54
+#: plugins/admin/systems/goFonServer.tpl:12
 msgid "Country dial prefix"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:58
+#: plugins/admin/systems/goFonServer.tpl:16
 msgid "Local dial prefix"
 msgstr ""
 
@@ -7107,26 +9041,36 @@ msgid "IMAP admin access"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 #, fuzzy
 msgid "Server identifier"
 msgstr "Номер дома"
 
 #: plugins/admin/systems/servdb.tpl:78
+#: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 #, fuzzy
 msgid "Connect URL"
 msgstr "Подключение"
 
 #: plugins/admin/systems/servdb.tpl:91
+#: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 #, fuzzy
 msgid "Sieve port"
 msgstr "Сервер"
 
 #: plugins/admin/systems/servdb.tpl:100
+#: plugins/admin/systems/class_goLogDBServer.inc:29
+#: plugins/admin/systems/class_goLogDBServer.inc:49
 #, fuzzy
 msgid "Logging database"
 msgstr "база пользователя"
 
 #: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+#: plugins/admin/systems/goGlpiServer.tpl:4
+#: plugins/admin/systems/goLogDBServer.tpl:4
 msgid "Logging DB user"
 msgstr ""
 
@@ -7136,6 +9080,8 @@ msgid "Glpi database"
 msgstr "Базы данных"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
+#: plugins/admin/systems/goGlpiServer.tpl:14
 #, fuzzy
 msgid "Database"
 msgstr "Базы данных"
@@ -7145,192 +9091,339 @@ msgstr "Базы данных"
 msgid "Machine name"
 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
+#: plugins/admin/systems/class_goFaxServer.inc:29
+#, fuzzy
+msgid "FAX service"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+#, fuzzy
+msgid "FAX database configuration"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
 #, fuzzy, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Атрибуты UNIX"
 
-#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_goFaxServer.inc:125
 #, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+msgid "Set status flag for server services/gofax with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:156
-msgid "The sieve port needs to be numeric."
-msgstr ""
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_servDB.inc:167
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
 #, fuzzy, php-format
-msgid "The specified kerberos password is empty."
-msgstr "Ð\97наÑ\87ение полÑ\8f \"ФайлÑ\8b\" некоÑ\80Ñ\80екÑ\82но."
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "Ð\9dепÑ\80авилÑ\8cное Ñ\83казание Ñ\82аймаÑ\83Ñ\82а '%s'"
 
-#: plugins/admin/systems/class_servDB.inc:191
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
 msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Список систем"
+#: plugins/admin/systems/class_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+#, fuzzy
+msgid "Fax server service"
+msgstr "Служба SSH"
 
-#: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Местоположение"
+
+#: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 #, 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."
+"This includes all 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/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Показать серверы"
+#: plugins/admin/systems/class_servKolab.inc:99
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#, fuzzy
-msgid "Select to see Linux terminals"
-msgstr "Выберите чтобы посмотреть терминалы"
+#: plugins/admin/systems/class_servKolab.inc:105
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Показать терминалы"
+#: plugins/admin/systems/class_servKolab.inc:191
+#: plugins/admin/systems/class_servKolab.inc:207
+#, fuzzy, php-format
+msgid "Removing host entry from system server/kolab with dn '%s' failed."
+msgstr "Удалить телефонный аккаунт"
 
-#: plugins/admin/systems/headpage.tpl:40
-#, fuzzy
-msgid "Select to see Linux workstations"
-msgstr "Выберите чтобы посмотреть рабочие станции"
+#: plugins/admin/systems/class_servKolab.inc:246
+msgid "Future days in Free/Busy settings must be set."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Показать рабочие станции"
+#: plugins/admin/systems/class_servKolab.inc:248
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Посмотреть рабочие станции с MicroSoft Windows"
+#: plugins/admin/systems/class_servKolab.inc:252
+msgid "The given Quota settings value must be a number."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Показать рабочие станции с windows"
+#: plugins/admin/systems/class_servKolab.inc:254
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Выберите чтобы посмотреть сетевые принтеры"
+#: plugins/admin/systems/class_servKolab.inc:256
+msgid "Future days must be a value."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Показать сетевые принтеры"
+#: plugins/admin/systems/class_servKolab.inc:260
+msgid "No SMTP privileged networks set."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Выберите чтобы посмотреть VOIP телефоны"
+#: plugins/admin/systems/class_servKolab.inc:332
+#, fuzzy, php-format
+msgid "Saving system server/kolab with dn '%s' failed."
+msgstr "Моя учетная запись"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Показать телефоны"
+#: plugins/admin/systems/class_servKolab.inc:354
+#, fuzzy
+msgid "Kolab mail service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_servKolab.inc:383
+#, php-format
+msgid "Set status flag for system server/kolab with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_servKolab.inc:414
 #, fuzzy
-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"
+msgid "Kolab service"
+msgstr "Ð\94обавиÑ\82Ñ\8c Ñ\81еÑ\80виÑ\81 DNS"
 
-#: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_servKolab.inc:423
 #, fuzzy
-msgid "Show network devices"
-msgstr "СеÑ\82евÑ\8bе Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
+msgid "My destination"
+msgstr "Ð\9dазнаÑ\87ение"
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Регулярное выражение, соответствующее именам систем"
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "Звук"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_servKolab.inc:427
 #, fuzzy
-msgid "Display systems of user"
-msgstr "Показать адреса пользователя"
+msgid "Relayhost"
+msgstr "Набор правил"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "Звук"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:108
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Имя пользователя, для которого перечисляются терминалы"
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:245
+#: plugins/admin/systems/class_printGeneric.inc:250
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:305
+#: plugins/admin/systems/class_printGeneric.inc:308
+msgid "Add printer extension"
+msgstr ""
 
-#: plugins/admin/systems/remove.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:238
 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."
+"Could not intialize printer tab, parameter parent was missing while "
+"construction."
 msgstr ""
-"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
-"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
-"результаты этой операции."
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_printGeneric.inc:246
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:251
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+msgid "This 'dn' has no printer features."
+msgstr "Этот DN не имеет свойств принтера."
+
+#: plugins/admin/systems/class_printGeneric.inc:290
 #, fuzzy
-msgid "Remove Kolab extension"
+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:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+#, fuzzy
+msgid "Remove printer extension"
 msgstr "Удалить параметры"
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_printGeneric.inc:298
+#, fuzzy
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_printGeneric.inc:301
 #, fuzzy
 msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
+"This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:118
+#: plugins/admin/systems/class_printGeneric.inc:306
 #, fuzzy
-msgid "Add Kolab service"
-msgstr "Добавить сервис DNS"
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:118
+#: plugins/admin/systems/class_printGeneric.inc:309
 #, fuzzy
 msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
+"This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:146
+#: plugins/admin/systems/class_printGeneric.inc:475
 #, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:152
+#: plugins/admin/systems/class_printGeneric.inc:483
+#, fuzzy
+msgid "can't get ppd informations."
+msgstr "Системная информация"
+
+#: plugins/admin/systems/class_printGeneric.inc:496
 #, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/class_printGeneric.inc:498
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/class_printGeneric.inc:553
+#, fuzzy, php-format
+msgid "Removing of system print/generic with dn '%s' failed."
+msgstr "Показать подразделения"
+
+#: plugins/admin/systems/class_printGeneric.inc:751
+#, php-format
+msgid "Saving of system print/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/class_printGeneric.inc:770
+#: plugins/admin/systems/class_printGeneric.inc:772
+#: plugins/admin/ogroups/class_ogroupManagement.inc:383
+#: plugins/admin/fai/faiTemplateEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Группа"
+
+#: plugins/admin/systems/class_printGeneric.inc:788
+#, fuzzy
+msgid "Print generic"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_printGeneric.inc:799
+msgid "LabeledURL"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/class_printGeneric.inc:800
+#, fuzzy
+msgid "Printer PPD"
+msgstr "Принтер"
+
+#: plugins/admin/systems/class_printGeneric.inc:817
+#, php-format
+msgid ""
+"You are not allowed to remove the given object '%s' from the list of members "
+"of printer '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "Future days must be a value."
+#: plugins/admin/systems/class_printGeneric.inc:834
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:243
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/class_printGeneric.inc:839
+#, php-format
+msgid ""
+"You are not allowed to add the given object '%s' to the list of members of '%"
+"s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:861
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:869
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
 
 #: plugins/admin/systems/password.tpl:2
@@ -7352,77 +9445,42 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr "Изменение пароля влияет только на аутентификацию в системе."
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
+#: plugins/admin/systems/class_componentGeneric.inc:101
+#, fuzzy, php-format
+msgid "Removing of system component/generic with dn '%s' failed."
+msgstr "Показать подразделения"
+
+#: plugins/admin/systems/class_componentGeneric.inc:139
 #, fuzzy
 msgid "The required field 'Component name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
+#: plugins/admin/systems/class_componentGeneric.inc:144
+#: plugins/admin/systems/class_phoneGeneric.inc:284
 #, fuzzy
-msgid "Printer type"
-msgstr "Ð\98мÑ\8f пÑ\80инÑ\82еÑ\80а"
+msgid "The required field IP address is empty."
+msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eÑ\81новной адÑ\80еÑ\81\" не заполнено."
 
-#: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
-#: 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/glpiPrinter.tpl:31
-#, fuzzy
-msgid "Supported interfaces"
-msgstr "Сетевой принтер"
-
-#: plugins/admin/systems/glpiPrinter.tpl:38
-#, fuzzy
-msgid "Serial"
-msgstr "терминалы"
-
-#: plugins/admin/systems/glpiPrinter.tpl:46
-#, fuzzy
-msgid "Parallel"
-msgstr "Переменная"
-
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
-msgstr ""
-
-#: plugins/admin/systems/glpiPrinter.tpl:66 plugins/admin/systems/glpi.tpl:40
+#: plugins/admin/systems/class_componentGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:287
 #, fuzzy
-msgid "Contacts"
-msgstr "Ð\9aонÑ\82акÑ\82"
+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/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-msgid "Technical responsible"
+#: plugins/admin/systems/class_componentGeneric.inc:223
+#, php-format
+msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
-#, fuzzy
-msgid "Contact person"
-msgstr "Контакт"
-
-#: plugins/admin/systems/glpiPrinter.tpl:88 plugins/admin/systems/glpi.tpl:95
+#: plugins/admin/systems/class_componentGeneric.inc:234
 #, fuzzy
-msgid "Attachments"
-msgstr "подÑ\80азделениÑ\8f"
+msgid "Component generic"
+msgstr "Ð\9fÑ\80оÑ\87ие Ñ\81еÑ\82евÑ\8bе компоненÑ\82Ñ\8b"
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
+#: plugins/admin/systems/class_componentGeneric.inc:239
 #, fuzzy
-msgid "Installed cartridges"
-msgstr "Ð\9aлиенÑ\82Ñ\81кие устройства"
+msgid "Network device"
+msgstr "СеÑ\82евÑ\8bе устройства"
 
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
@@ -7472,6 +9530,79 @@ msgstr "Прочие сетевые компоненты"
 msgid "Create"
 msgstr "Создать"
 
+#: plugins/admin/systems/goNtpServer.tpl:2
+#, fuzzy
+msgid "Time server"
+msgstr "Сервисы"
+
+#: plugins/admin/systems/glpiPrinter.tpl:9
+#, fuzzy
+msgid "Printer type"
+msgstr "Имя принтера"
+
+#: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
+#: 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/class_glpiPrinterAccount.inc:781
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:31
+#, fuzzy
+msgid "Supported interfaces"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/glpiPrinter.tpl:46
+#, fuzzy
+msgid "Parallel"
+msgstr "Переменная"
+
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:66 plugins/admin/systems/glpi.tpl:40
+#, fuzzy
+msgid "Contacts"
+msgstr "Контакт"
+
+#: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
+#, fuzzy
+msgid "Contact person"
+msgstr "Контакт"
+
+#: plugins/admin/systems/glpiPrinter.tpl:88 plugins/admin/systems/glpi.tpl:95
+#, fuzzy
+msgid "Attachments"
+msgstr "подразделения"
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+#, fuzzy
+msgid "Installed cartridges"
+msgstr "Клиентские устройства"
+
 #: plugins/admin/systems/servnfs.tpl:1
 #, fuzzy
 msgid "Edit share"
@@ -7482,15 +9613,22 @@ msgid "NFS setup"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/class_servNfs.inc:277
+#, fuzzy
+msgid "Volume"
+msgstr "Имя системы"
+
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/servnfs.tpl:94
 #, fuzzy
 msgid "Codepage"
 msgstr "Домашняя страница"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:276
 #, fuzzy
 msgid "Option"
 msgstr "Параметры"
@@ -7502,11 +9640,13 @@ msgid "System type"
 msgstr "Системы"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 #, fuzzy
 msgid "Operating system"
 msgstr "Удалить"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -7561,102 +9701,157 @@ msgid "This 'dn' has no phone features."
 msgstr "Этот DN не имеет свойств телефона."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:385
+#: plugins/gofon/macro/class_divListMacros.inc:116
 #, fuzzy
 msgid "yes"
 msgstr "Системы"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:386
+#: plugins/gofon/macro/class_divListMacros.inc:117
 #, fuzzy
 msgid "no"
 msgstr "нет"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:224
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:224
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 #, fuzzy
 msgid "Networksettings"
 msgstr "Сетевые настройки"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:239
+#: plugins/admin/systems/class_phoneGeneric.inc:240
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:298
+#: plugins/admin/systems/class_phoneGeneric.inc:247
+#, php-format
+msgid "Removing of system phone/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 #, fuzzy
 msgid "The required field 'Phone name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:301
+#: plugins/admin/systems/class_phoneGeneric.inc:295
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:308
+#: plugins/admin/systems/class_phoneGeneric.inc:302
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
-#: plugins/admin/systems/class_servNfs.inc:35
+#: plugins/admin/systems/class_phoneGeneric.inc:397
+#, php-format
+msgid "Saving of system phone/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Телефонные номера"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Телефонное оборудование"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+#, fuzzy
+msgid "DTMF mode"
+msgstr "Режим"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "по умолчанию"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
+#: 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/class_servNfs.inc:38
+#: plugins/admin/systems/class_servNfs.inc:49
 #, fuzzy
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr "Удалить"
 
-#: plugins/admin/systems/class_servNfs.inc:126
+#: plugins/admin/systems/class_servNfs.inc:180
 #, fuzzy
 msgid "Please specify a valid path for your setup."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:132
+#: plugins/admin/systems/class_servNfs.inc:186
 #, fuzzy
-msgid "Please specify a valid name for your setup."
+msgid "Please specify a valid name for your share."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:135
+#: plugins/admin/systems/class_servNfs.inc:189
 #, fuzzy
-msgid "Please specify a name for your setup."
+msgid "Please specify a name for your share."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servNfs.inc:140
+#: plugins/admin/systems/class_servNfs.inc:194
 #, fuzzy
 msgid "Description contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_servNfs.inc:144
+#: plugins/admin/systems/class_servNfs.inc:198
+#, fuzzy
+msgid "Volume contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_servNfs.inc:202
 #, fuzzy
 msgid "Path contains invalid characters."
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: plugins/admin/systems/class_servNfs.inc:148
+#: plugins/admin/systems/class_servNfs.inc:206
 #, fuzzy
 msgid "Option contains invalid characters."
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_workstationStartup.inc:225
-msgid "inherited"
+#: plugins/admin/systems/class_servNfs.inc:263
+msgid "NFS"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:336
+#: plugins/admin/systems/class_servNfs.inc:264
+#, fuzzy
+msgid "NFS service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_servNfs.inc:274
+#, fuzzy
+msgid "Charset"
+msgstr "сброс"
+
+#: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:381
+#: plugins/admin/systems/class_workstationStartup.inc:436
 #, fuzzy
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr "Введите корректный номер телефона!"
 
-#: plugins/admin/systems/class_workstationStartup.inc:439
+#: plugins/admin/systems/class_workstationStartup.inc:494
 #, fuzzy
 msgid ""
 "There is already a profile in your selection that contain partition table "
@@ -7664,14 +9859,14 @@ msgid ""
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/class_workstationStartup.inc:758
+#: plugins/admin/systems/class_workstationStartup.inc:831
 #, 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_workstationStartup.inc:769
+#: plugins/admin/systems/class_workstationStartup.inc:845
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -7680,6 +9875,50 @@ msgid ""
 "be saved."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationStartup.inc:1013
+#, fuzzy, php-format
+msgid "Saving of system workstation/startup with dn '%s' failed."
+msgstr "Шаблон рабочей станции"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1063
+#, fuzzy, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1065
+#: 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_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "Состояние системы"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+#, fuzzy
+msgid "FAI classes"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+#, fuzzy
+msgid "Debian release"
+msgstr "Текущий пароль"
+
 #: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
 msgid "Advanced phone settings"
@@ -7691,78 +9930,73 @@ msgid "Phone type"
 msgstr "Название"
 
 #: 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/phonesettings.tpl:27
+#: plugins/admin/systems/phonesettings.tpl:37
+#: plugins/admin/systems/phonesettings.tpl:51
+#: plugins/admin/systems/phonesettings.tpl:80
+#: plugins/admin/systems/phonesettings.tpl:111
+#: plugins/admin/systems/phonesettings.tpl:158
 #, fuzzy
 msgid "Choose a phone type"
 msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:11
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
-#, fuzzy
-msgid "DTMF mode"
-msgstr "Режим"
-
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
+#: plugins/admin/systems/phonesettings.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:87
 #, fuzzy
 msgid "Default IP"
 msgstr "по умолчанию"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
+#: plugins/admin/systems/phonesettings.tpl:58
+#: plugins/admin/systems/phonesettings.tpl:95
 msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
+#: plugins/admin/systems/phonesettings.tpl:77
 #, fuzzy
 msgid "Modus"
 msgstr "Мышь"
 
-#: plugins/admin/systems/phonesettings.tpl:106
+#: plugins/admin/systems/phonesettings.tpl:108
 msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
+#: plugins/admin/systems/phonesettings.tpl:118
 #, fuzzy
 msgid "Secret"
 msgstr "Улица"
 
-#: plugins/admin/systems/phonesettings.tpl:124
+#: plugins/admin/systems/phonesettings.tpl:126
 msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
+#: plugins/admin/systems/phonesettings.tpl:134
 msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
+#: plugins/admin/systems/phonesettings.tpl:147
 #, fuzzy
 msgid "Account code"
 msgstr "Учетная запись"
 
-#: plugins/admin/systems/phonesettings.tpl:153
+#: plugins/admin/systems/phonesettings.tpl:155
 #, fuzzy
 msgid "Trunk lines"
 msgstr "Тонкие клиенты"
 
-#: plugins/admin/systems/phonesettings.tpl:168
+#: plugins/admin/systems/phonesettings.tpl:170
 msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:183
+#: plugins/admin/systems/phonesettings.tpl:185
 #, fuzzy
 msgid "Hosts that are not allowed to connect"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/phonesettings.tpl:205
+#: plugins/admin/systems/phonesettings.tpl:207
 msgid "MSN"
 msgstr ""
 
@@ -7786,69 +10020,93 @@ msgstr "Показать совпадения номеров"
 msgid "Regular expression for matching member names"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#: plugins/admin/systems/class_printerPPDDialog.inc:87
+#, fuzzy
+msgid "Can't get ppd informations."
+msgstr "Общая информация о пользователе"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:99
 #, php-format
 msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
+"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:109
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
 #, fuzzy
-msgid "Can't get ppd informations."
-msgstr "Общая информация о пользователе"
+msgid "Please specify a valid ppd file."
+msgstr "Введите корректное имя пользователя!"
+
+#: 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_printerPPDDialog.inc:125
+#: 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_printerPPDDialog.inc:138
+#: plugins/admin/systems/class_printerPPDDialog.inc:211
+#, fuzzy, php-format
+msgid "Can't create file '%s' to store modifed ppd informations."
+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_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_printerPPDDialog.inc:267
 #, fuzzy, php-format
 msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#: plugins/admin/systems/class_printerPPDDialog.inc:288
 #, fuzzy, php-format
 msgid "Can't save file '%s'."
 msgstr "Удалить"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-#, fuzzy
-msgid "Please specify a valid ppd file."
-msgstr "Введите корректное имя пользователя!"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-#, fuzzy
-msgid "Please select a valid ppd."
-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_printerPPDDialog.inc:319
+#: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 #, fuzzy
 msgid "Section"
 msgstr "Действие"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
+#: plugins/admin/systems/class_printerPPDDialog.inc:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
 #, fuzzy
 msgid "True"
 msgstr "Улица"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
 #, fuzzy
 msgid "False"
 msgstr "женский"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_printerPPDDialog.inc:471
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
@@ -7862,11 +10120,11 @@ msgstr "Устройство печати"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Модель"
 
 #: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #, fuzzy
 msgid "Select"
 msgstr "Удалить"
@@ -7884,7 +10142,7 @@ msgstr "Выбрать объекты для добавления"
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:46
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/fai/headpage.tpl:82 plugins/admin/fai/faiProfileEntry.tpl:54
+#: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiPackageEntry.tpl:42
 msgid "Display objects matching"
@@ -7893,7 +10151,7 @@ msgstr "Показать совпадения объектов"
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:50
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
-#: plugins/admin/fai/headpage.tpl:86 plugins/admin/fai/faiProfileEntry.tpl:59
+#: plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 msgid "Regular expression for matching object names"
 msgstr "Регулярное выражение, соответствующее именам объектов"
@@ -7908,6 +10166,16 @@ msgstr ""
 msgid "Printer ppd selection."
 msgstr "Настройки телефона"
 
+#: plugins/admin/systems/class_workstationService.inc:421
+#, fuzzy, php-format
+msgid "Saving of system workstation/service with dn '%s' failed."
+msgstr "Дополнительные записи в fstab"
+
+#: plugins/admin/systems/class_workstationService.inc:430
+#, fuzzy
+msgid "Workstation service"
+msgstr "Рабочие станции"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -7958,21 +10226,6 @@ msgstr "Порт"
 msgid "Choose mouse port"
 msgstr "Выберите порт мыши"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Телефонное оборудование"
-
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-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"
@@ -7998,46 +10251,41 @@ msgstr "Выберите подходящую глубину цвета"
 msgid "Display device"
 msgstr "Устройство отображения"
 
-#: plugins/admin/systems/workstationService.tpl:121
-#, fuzzy
-msgid "unknown"
-msgstr "состояние неизвестно"
-
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
+#: plugins/admin/systems/workstationService.tpl:125
+msgid "Use DDC for automatic detection"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/workstationService.tpl:128
 #: plugins/admin/systems/terminalService.tpl:124
 msgid "HSync"
 msgstr "Строчная синхронизация"
 
-#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/workstationService.tpl:130
 #: plugins/admin/systems/terminalService.tpl:126
 msgid "Horizontal refresh frequency for installed monitor"
 msgstr "Частота обновления строк для данного монитора"
 
-#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/workstationService.tpl:133
 #: plugins/admin/systems/terminalService.tpl:129
 msgid "VSync"
 msgstr "Кадровая синхронизация"
 
-#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/workstationService.tpl:135
 #: plugins/admin/systems/terminalService.tpl:131
 msgid "Vertical refresh frequency for installed monitor"
 msgstr "Частота обновления кадров для данного монитора"
 
-#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/workstationService.tpl:147
 #: plugins/admin/systems/terminalService.tpl:203
 msgid "Scan device"
 msgstr "Устройство сканирования"
 
-#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/workstationService.tpl:148
 #: 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/workstationService.tpl:149
 #: plugins/admin/systems/terminalService.tpl:205
 msgid "Provide scan services"
 msgstr "Предоставлять службу сканирования"
@@ -8047,23 +10295,13 @@ msgstr "Предоставлять службу сканирования"
 msgid "Boot parameters"
 msgstr "Параметры загрузки"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "LDAP-сервер"
-
-#: plugins/admin/systems/workstationStartup.tpl:13
-#: plugins/admin/systems/terminalStartup.tpl:13
-msgid "Boot kernel"
-msgstr "Ядро для загрузки"
-
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
 msgstr "Дополнительные параметры"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:19
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
@@ -8071,42 +10309,52 @@ msgstr ""
 "Введите любые дополнительные параметры, которые должны передаваться ядру во "
 "время загрузки"
 
-#: plugins/admin/systems/workstationStartup.tpl:37
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "LDAP server"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/workstationStartup.tpl:41
+#: plugins/admin/systems/workstationStartup.tpl:71
 #, fuzzy
 msgid "FAI server"
 msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:248
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:45
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/servRepositorySetup.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackageNew.tpl:24
 #, fuzzy
 msgid "Release"
 msgstr "Набор правил"
 
-#: plugins/admin/systems/workstationStartup.tpl:47
-#: plugins/admin/fai/faiPackageNew.tpl:35
-#, fuzzy
-msgid "set"
-msgstr "сброс"
-
-#: plugins/admin/systems/workstationStartup.tpl:54
+#: plugins/admin/systems/workstationStartup.tpl:63
+#: plugins/admin/systems/workstationStartup.tpl:95
 #, fuzzy
 msgid "Assigned FAI classes"
 msgstr "Выберите тип мыши"
 
-#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/workstationStartup.tpl:85
+#, fuzzy
+msgid "set"
+msgstr "сброс"
+
+#: plugins/admin/systems/workstationStartup.tpl:116
 #: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr "Модули ядра (формат: имя параметры)"
 
-#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/workstationStartup.tpl:118
 #: plugins/admin/systems/terminalStartup.tpl:55
 msgid "Add additional modules to load on startup"
 msgstr ""
 "Укажите дополнительные модули, которые должны загружаться при запуске системы"
 
-#: plugins/admin/systems/workstationStartup.tpl:99
+#: plugins/admin/systems/workstationStartup.tpl:142
 #: plugins/admin/systems/terminalStartup.tpl:79
 #, fuzzy
 msgid "Mountpoint"
@@ -8139,10 +10387,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr "Используйте отладочный режим"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Удаленная рабочая станция"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Способ подключения"
@@ -8179,10 +10423,6 @@ msgstr "Выберите, чтобы запустить на терминале
 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 для хранения временных файлов"
@@ -8191,87 +10431,83 @@ msgstr "Выберите файловую систему NFS для хранен
 msgid "Select scanner driver to use"
 msgstr "Выберите драйвер для используемого сканера"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
+#: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
+#: plugins/admin/fai/faiPackage.tpl:29
+#, fuzzy
+msgid "Repository"
+msgstr "Повторить"
+
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 #, fuzzy
 msgid "Parent server"
 msgstr "Служба печати"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:249
-#: plugins/admin/systems/class_servRepository.inc:270
+#: plugins/admin/systems/class_servRepository.inc:245
+#: plugins/admin/systems/class_servRepository.inc:266
 #, fuzzy
 msgid "Sections"
 msgstr "Действие"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:118
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
 #, fuzzy
 msgid "Please enter a value for 'release'."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:122
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
 #, fuzzy
 msgid "Please specify a valid value for 'url'."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:168
-#, fuzzy, php-format
-msgid "Can't execute specified EXTERNAL_HOOK '%s' please check your gosa.conf."
-msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
-
 #: plugins/admin/systems/class_servRepositorySetup.inc:170
-#, php-format
-msgid ""
-"The specified EXTERNAL_HOOK '%s', specified in your gosa.conf, returns an "
-"empty string."
-msgstr ""
-
-#: plugins/admin/systems/class_servRepository.inc:97
-#, fuzzy
-msgid "Remove FAI repository extension."
-msgstr "Удалить параметры"
-
-#: plugins/admin/systems/class_servRepository.inc:98
-#, fuzzy
+#, fuzzy, php-format
 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."
-msgstr ""
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: plugins/admin/systems/class_servRepository.inc:101
+#: plugins/admin/systems/class_servRepository.inc:35
+#: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 #, fuzzy
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Repository service"
+msgstr "Служба печати"
 
-#: plugins/admin/systems/class_servRepository.inc:144
+#: plugins/admin/systems/class_servRepository.inc:137
 #, 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_servRepository.inc:176
+#: plugins/admin/systems/class_servRepository.inc:171
 #, php-format
 msgid ""
 "Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:208
+#: plugins/admin/systems/class_servRepository.inc:204
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
-#: plugins/admin/fai/class_faiManagement.inc:392
+#: plugins/admin/fai/class_faiManagement.inc:331
 #, fuzzy
 msgid "This name is already in use."
 msgstr "Указанное имя уже используется."
 
+#: plugins/admin/systems/class_servRepository.inc:421
+#, php-format
+msgid "Set status flag for server services/repository with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:441
+#, fuzzy
+msgid "Releases"
+msgstr "Набор правил"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 #, fuzzy
 msgid "List of configured repositories."
@@ -8286,6 +10522,54 @@ msgstr "Повторить"
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+#, fuzzy
+msgid "Inventory database"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+#, fuzzy
+msgid "Glpi management"
+msgstr "Название"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+#, fuzzy
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Служба SSH"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "DN администратора"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 #, fuzzy
 msgid "Manage System-types"
@@ -8334,13 +10618,17 @@ msgstr "Регулярное выражение, соответствующее
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #, fuzzy
 msgid "Use"
 msgstr "Пользователь"
 
+#: plugins/admin/systems/goFonServer.tpl:1
+#, fuzzy
+msgid "VoIP database information"
+msgstr "Системная информация"
+
 #: plugins/admin/systems/class_glpiAccount.inc:144
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:156
 msgid "There is no server with valid glpi database service."
@@ -8396,13 +10684,13 @@ msgstr ""
 msgid "Updating operating system failed, specifed name is already used."
 msgstr "Группа с таким именем уже существует."
 
-#: plugins/admin/systems/class_glpiAccount.inc:564
+#: plugins/admin/systems/class_glpiAccount.inc:565
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:199
 #, fuzzy
 msgid "Remove inventory"
 msgstr "Удалить объект"
 
-#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiAccount.inc:566
 #, fuzzy
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
@@ -8411,13 +10699,13 @@ msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
+#: plugins/admin/systems/class_glpiAccount.inc:568
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:202
 #, fuzzy
 msgid "Add inventory"
 msgstr "Добавить объект"
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiAccount.inc:569
 #, fuzzy
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
@@ -8426,14 +10714,58 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+#: plugins/admin/systems/class_glpiAccount.inc:633
+#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
 msgid "N/A"
 msgstr ""
 
+#: plugins/admin/systems/class_glpiAccount.inc:667
+#, fuzzy
+msgid "Can't remove glpi account, while mysql extension is missing."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+#, fuzzy
+msgid "Inventory extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#, fuzzy
+msgid "Attachment name"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "подразделения"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Peripheral devices"
+msgstr "Сетевые устройства"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 #, fuzzy
 msgid "Manage manufacturers"
@@ -8477,6 +10809,7 @@ msgstr "Редактиовать объект"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 #, fuzzy
 msgid "Comments"
@@ -8627,6 +10960,7 @@ msgid "Add/Edit network interface"
 msgstr "Сетевой принтер"
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 #, fuzzy
 msgid "MAC address"
 msgstr "MAC-адрес"
@@ -8719,7 +11053,7 @@ msgid "New processor"
 msgstr "Новый пароль"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_faiManagement.inc:655
+#: plugins/admin/fai/class_divListFai.inc:131
 msgid "P"
 msgstr ""
 
@@ -8841,8 +11175,8 @@ msgstr "запись"
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
 #: plugins/admin/ogroups/class_mailogroup.inc:138
-#: plugins/admin/ogroups/class_phonequeue.inc:692
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: plugins/admin/ogroups/class_phonequeue.inc:691
+#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
 #: html/getxls.php:236
 #, fuzzy
 msgid "Phone number"
@@ -8997,11 +11331,36 @@ msgstr ""
 msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:751
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
 #, fuzzy
 msgid "since"
 msgstr "Работает с"
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Сетевой принтер"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Почтовые настройки пользователя"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, fuzzy, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -9018,54 +11377,80 @@ msgstr ""
 msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:264
+#: plugins/admin/systems/class_termDNS.inc:132
+#, fuzzy, php-format
+msgid ""
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
+
+#: plugins/admin/systems/class_termDNS.inc:298
 #, fuzzy
 msgid "The required field 'IP-address' is not set."
 msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/admin/systems/class_termDNS.inc:271
+#: plugins/admin/systems/class_termDNS.inc:305
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:278
+#: plugins/admin/systems/class_termDNS.inc:312
 #, fuzzy
 msgid "The required field 'MAC-address' is not set."
 msgstr "Обязательное поле \"Основной адрес\" не заполнено."
 
-#: plugins/admin/systems/class_termDNS.inc:285
+#: plugins/admin/systems/class_termDNS.inc:319
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:305
+#: plugins/admin/systems/class_termDNS.inc:339
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:313
+#: 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_termDNS.inc:324
+#: 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_termDNS.inc:331
-#: plugins/admin/systems/class_servDNSeditZone.inc:401
+#: plugins/admin/systems/class_termDNS.inc:365
+#: plugins/admin/systems/class_servDNSeditZone.inc:409
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
+#: plugins/admin/systems/class_termDNS.inc:448
+#, fuzzy, php-format
+msgid "Saving of terminal/dns account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/admin/systems/class_termDNS.inc:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Настройки Samba"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "Каталог"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "IP-адрес"
+
 #: 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:306
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
 #, fuzzy
 msgid "The selected name is already in use."
 msgstr "Указанное имя уже используется."
@@ -9098,21 +11483,11 @@ msgstr "Регулярное выражение для поиска адреса
 msgid "Reference"
 msgstr "Ссылки"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-#, fuzzy
-msgid "Zone name"
-msgstr "Название"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 #, fuzzy
 msgid "Network address"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-#, fuzzy
-msgid "Zone entries"
-msgstr "Настройки телефона"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -9131,18 +11506,6 @@ msgstr "Основной адрес эл. почты для этой общей
 msgid "Serial number (automatically incremented)"
 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
-#, fuzzy
-msgid "Expire"
-msgstr "Экспорт"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 #, fuzzy
 msgid "MxRecords"
@@ -9150,19 +11513,21 @@ msgstr "Каталог"
 
 #: plugins/admin/systems/servdnseditzone.tpl:112
 #, fuzzy
-msgid "Zone records"
+msgid "Global zone records"
 msgstr "Каталог"
 
 #: 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, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"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/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
 #: plugins/admin/systems/SelectDeviceType.tpl:21
@@ -9171,17 +11536,18 @@ msgid "Choose a system type"
 msgstr "Выберите тип мыши"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr ""
+#, fuzzy
+msgid "Choose an object group as template"
+msgstr "Объект группы"
 
 #: plugins/admin/systems/SelectDeviceType.tpl:33
 #, fuzzy
-msgid "Choose a object group"
+msgid "Choose an object group"
 msgstr "Объект группы"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:363
 #, fuzzy
 msgid "Down"
 msgstr "Домен"
@@ -9197,45 +11563,55 @@ msgid "This reverse zone is already in use"
 msgstr "Указанное имя уже используется."
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:359
+#, fuzzy, php-format
+msgid "Please choose a valid zone name."
+msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#, fuzzy, php-format
+msgid "Please choose a valid reverse zone name."
+msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
+
+#: 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:363
+#: 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:367
-#: plugins/admin/systems/class_servDNSeditZone.inc:371
+#: 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:375
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
 msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:379
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
 #, fuzzy
 msgid "Please specify a numeric value for serial number."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:383
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
 #, fuzzy
 msgid "Please specify a numeric value for refresh."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:387
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
 #, fuzzy
 msgid "Please specify a numeric value for ttl."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:391
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
 #, fuzzy
 msgid "Please specify a numeric value for expire."
 msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:395
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
 #, fuzzy
 msgid "Please specify a numeric value for retry."
 msgstr "Укажите корректный номер телефона."
@@ -9260,58 +11636,59 @@ msgstr ""
 msgid "Select this base"
 msgstr "Удалить"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:173
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#, fuzzy
+msgid "New entry"
+msgstr "пользователи"
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
 #, php-format
 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_servDNSeditZoneEntries.inc:200
+#: 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:209
+#: 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:215
+#: 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:224
+#: 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:230
+#: 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:247
+#: 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:254
+#: 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:262
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
 #, php-format
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:353
-#, php-format
-msgid "Settings for '%s'"
-msgstr ""
-
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
 msgid ""
 "This dialog allows you to configure all components of this DNS zone on a "
@@ -9330,1535 +11707,3033 @@ msgid ""
 "zone entry exists in the ldap database."
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
-msgid "To add a new host entry just click here"
-msgstr ""
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#, fuzzy
+msgid "Create a new DNS zone entry"
+msgstr "Создание нового объекта в"
 
-#: plugins/admin/systems/class_printGeneric.inc:223
-#: plugins/admin/systems/class_printGeneric.inc:231
-#: plugins/admin/systems/class_printGeneric.inc:236
-#: plugins/admin/systems/class_printGeneric.inc:275
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:294
-msgid "Add printer extension"
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
+msgstr "Список систем"
 
-#: plugins/admin/systems/class_printGeneric.inc:224
+#: plugins/admin/systems/class_divListSystem.inc:42
+#, fuzzy
 msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construcktion."
+"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_printGeneric.inc:232
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:58
+#, fuzzy
+msgid "System / Department"
+msgstr "Подразделение"
 
-#: plugins/admin/systems/class_printGeneric.inc:237
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Показать серверы"
 
-#: plugins/admin/systems/class_printGeneric.inc:268
-msgid "This 'dn' has no printer features."
-msgstr "Этот DN не имеет свойств принтера."
+#: plugins/admin/systems/class_divListSystem.inc:63
+#, fuzzy
+msgid "Select to see Linux terminals"
+msgstr "Выберите чтобы посмотреть терминалы"
+
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Показать терминалы"
 
-#: plugins/admin/systems/class_printGeneric.inc:276
+#: plugins/admin/systems/class_divListSystem.inc:64
+#, fuzzy
+msgid "Select to see Linux workstations"
+msgstr "Выберите чтобы посмотреть рабочие станции"
+
+#: plugins/admin/systems/class_divListSystem.inc:64
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Показать рабочие станции"
+
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Посмотреть рабочие станции с MicroSoft Windows"
+
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Show windows based workstations"
+msgstr "Показать рабочие станции с windows"
+
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Select to see network printers"
+msgstr "Выберите чтобы посмотреть сетевые принтеры"
+
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Show network printers"
+msgstr "Показать сетевые принтеры"
+
+#: plugins/admin/systems/class_divListSystem.inc:67
+msgid "Select to see VOIP phones"
+msgstr "Выберите чтобы посмотреть VOIP телефоны"
+
+#: plugins/admin/systems/class_divListSystem.inc:67
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Показать телефоны"
+
+#: plugins/admin/systems/class_divListSystem.inc:68
+#, fuzzy
+msgid "Select to see network devices"
+msgstr "Выберите чтобы посмотреть сетевые принтеры"
+
+#: plugins/admin/systems/class_divListSystem.inc:68
+#, fuzzy
+msgid "Show network devices"
+msgstr "Сетевые устройства"
+
+#: plugins/admin/systems/class_divListSystem.inc:76
+#, fuzzy
+msgid "Display systems of user"
+msgstr "Показать адреса пользователя"
+
+#: plugins/admin/systems/class_divListSystem.inc:103
+#, fuzzy
+msgid "New Terminal template"
+msgstr "Шаблон терминала"
+
+#: plugins/admin/systems/class_divListSystem.inc:105
+#, fuzzy
+msgid "New Workstation template"
+msgstr "Шаблон рабочей станции"
+
+#: plugins/admin/systems/class_divListSystem.inc:106
+#: plugins/admin/systems/class_divListSystem.inc:107
+#, fuzzy
+msgid "New Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_divListSystem.inc:108
+#: plugins/admin/systems/class_divListSystem.inc:109
+#, fuzzy
+msgid "New Printer"
+msgstr "Принтер"
+
+#: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/systems/class_divListSystem.inc:111
+#, fuzzy
+msgid "New Phone"
+msgstr "Телефон"
+
+#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/class_divListSystem.inc:113
+#, fuzzy
+msgid "New Component"
+msgstr "Прочие сетевые компоненты"
+
+#: plugins/admin/systems/class_divListSystem.inc:131
+#, fuzzy
+msgid "Cups Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_divListSystem.inc:132
+msgid "Log Db"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:133
+#, fuzzy
+msgid "Syslog Server"
+msgstr "Сервер системных журналов"
+
+#: plugins/admin/systems/class_divListSystem.inc:134
+#, fuzzy
+msgid "Mail Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_divListSystem.inc:135
+#, fuzzy
+msgid "Imap Server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_divListSystem.inc:136
+#, fuzzy
+msgid "Nfs Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_divListSystem.inc:137
+#, fuzzy
+msgid "Kerberos Server"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_divListSystem.inc:138
+#, fuzzy
+msgid "Asterisk Server"
+msgstr "Терминальный сервер"
+
+#: plugins/admin/systems/class_divListSystem.inc:139
+#, fuzzy
+msgid "Fax Server"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_divListSystem.inc:140
+#, fuzzy
+msgid "Ldap Server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_divListSystem.inc:156
+#: plugins/admin/acl/class_divListACL.inc:123
+#, fuzzy
+msgid "Edit system"
+msgstr "Список систем"
+
+#: plugins/admin/systems/class_divListSystem.inc:158
+#: plugins/admin/acl/class_divListACL.inc:126
+#, fuzzy
+msgid "Delete system"
+msgstr "Удалить"
+
+#: plugins/admin/systems/class_divListSystem.inc:189
+#, fuzzy
+msgid "Set root       password"
+msgstr "Изменить пароль"
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:3
+msgid "Adding a new service to the current server"
+msgstr ""
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:7
+msgid ""
+"This dialog allows you to add new services to the currenty edited server "
+"object. The box below shows all available but not already used services."
+msgstr ""
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:13
+#, fuzzy
+msgid "Service to add"
+msgstr "Выбрать номера для добавления"
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:20
+#, fuzzy
+msgid "All available services are already in use."
+msgstr "Указанное имя уже используется."
+
+#: plugins/admin/systems/class_goCupsServer.inc:76
+#, fuzzy, php-format
+msgid "Removing of server services/cups with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goCupsServer.inc:100
+#, fuzzy, php-format
+msgid "Saving of server services/cups with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goCupsServer.inc:122
+#, php-format
+msgid "Set status flag for server services/cups with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goCupsServer.inc:206
+#, fuzzy
+msgid "Cups"
+msgstr "группы"
+
+#: plugins/admin/systems/class_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Звук"
+
+#: plugins/admin/systems/goLdapServer.tpl:1
+#: plugins/admin/systems/class_goLdapServer.inc:27
+#, fuzzy
+msgid "LDAP service"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:79
+#, php-format
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:17
+#: plugins/admin/systems/class_divListSystemService.inc:18
+#, fuzzy
+msgid "Installed services"
+msgstr "Клиентские устройства"
+
+#: plugins/admin/systems/class_divListSystemService.inc:22
+#, fuzzy
+msgid ""
+"This menu allows you to add, remove and configure the properties of a "
+"specific service."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять свойства "
+"отдельных систем. Вы можете только добавлять системы которые однажды уже "
+"были запущены."
+
+#: plugins/admin/systems/class_divListSystemService.inc:30
+#, fuzzy
+msgid "Service name"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/class_divListSystemService.inc:51
+#, fuzzy
+msgid "Add service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_divListSystemService.inc:51
+#, fuzzy
+msgid "Add new service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_divListSystemService.inc:54
+#, fuzzy
+msgid "Start all"
+msgstr "Запуск"
+
+#: plugins/admin/systems/class_divListSystemService.inc:54
+#, fuzzy
+msgid "Start all services"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/admin/systems/class_divListSystemService.inc:56
+#: plugins/admin/systems/class_divListSystemService.inc:106
+#, fuzzy
+msgid "Stop service"
+msgstr "Звук"
+
+#: plugins/admin/systems/class_divListSystemService.inc:56
+#, fuzzy
+msgid "Stop all services"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/admin/systems/class_divListSystemService.inc:58
+#: plugins/admin/systems/class_divListSystemService.inc:112
+#, fuzzy
+msgid "Restart service"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_divListSystemService.inc:58
+#, fuzzy
+msgid "Restart all services"
+msgstr "Предоставлять службу сканирования"
+
+#: plugins/admin/systems/class_divListSystemService.inc:86
+#, fuzzy
+msgid "Stopped"
+msgstr "Пол"
+
+#: plugins/admin/systems/class_divListSystemService.inc:87
+#, fuzzy
+msgid "Started"
+msgstr "Адм. единица"
+
+#: plugins/admin/systems/class_divListSystemService.inc:88
+#, fuzzy
+msgid "Restarting"
+msgstr "Назначение"
+
+#: plugins/admin/systems/class_divListSystemService.inc:89
+#, fuzzy
+msgid "User status"
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/admin/systems/class_divListSystemService.inc:100
+#, fuzzy
+msgid "Start service"
+msgstr "Сканер"
+
+#: plugins/admin/systems/class_divListSystemService.inc:118
+#, fuzzy
+msgid "Edit service"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_divListSystemService.inc:124
+#, fuzzy
+msgid "Remove service"
+msgstr "Удалить сервис DNS"
+
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:8
+#, fuzzy
+msgid "Start"
+msgstr "Запуск"
+
+#: plugins/admin/systems/class_serverService.inc:9
+#, fuzzy
+msgid "Restart"
+msgstr "Повторить"
+
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+#, fuzzy
+msgid "Time service"
+msgstr "Сервисы"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+#, fuzzy
+msgid "NTP service"
+msgstr "Сервер NTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
+#, fuzzy, php-format
+msgid "Removing server services/goNtpServer with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goNtpServer.inc:122
+#, fuzzy, php-format
+msgid "Saving server services/goNtpServer with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goNtpServer.inc:149
+#, php-format
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:219
+#, fuzzy
+msgid "NTP"
+msgstr "FTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+#, fuzzy
+msgid "Ntp source"
+msgstr "Звук"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, fuzzy, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, fuzzy, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+#, fuzzy
+msgid "The given base is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/goMailServer.tpl:7
+msgid "Visible full qualified hostname"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:10
+msgid "The full qualified host name."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:14
+#, fuzzy
+msgid "Max mail header size"
+msgstr "Размер квоты"
+
+#: plugins/admin/systems/goMailServer.tpl:18
+#, fuzzy
+msgid "This value specifies the maximal header size."
+msgstr "Группа с таким именем уже существует."
+
+#: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
+#, fuzzy
+msgid "Max mailbox size"
+msgstr "Размер квоты"
+
+#: plugins/admin/systems/goMailServer.tpl:26
+msgid "Defines the maximal size of mail box."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
+#, fuzzy
+msgid "Max message size"
+msgstr "Сообщение"
+
+#: plugins/admin/systems/goMailServer.tpl:34
+msgid "Specify the maximal size of a message."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
+#, fuzzy
+msgid "Relay host"
+msgstr "Набор правил"
+
+#: plugins/admin/systems/goMailServer.tpl:42
+msgid "Relay messages to following host:"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
+msgid "Local networks"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:52
+#, fuzzy
+msgid "Postfix networks"
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/goMailServer.tpl:66
+#, fuzzy
+msgid "Domains and routing"
+msgstr "Администраторы домена"
+
+#: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
+msgid "Domains to accept mail for"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:75
+msgid "Postfix is responsible for the following domains:"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:89
+#, fuzzy
+msgid "Transports"
+msgstr "Время передачи"
+
+#: plugins/admin/systems/goMailServer.tpl:92
+msgid "Select a transport protocol."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:105
+#, fuzzy
+msgid "Restrictions"
+msgstr "Действие"
+
+#: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
+#, fuzzy
+msgid "Restrictions for sender"
+msgstr "Местоположение ветки"
+
+#: plugins/admin/systems/goMailServer.tpl:116
+#: plugins/admin/systems/goMailServer.tpl:132
+#, fuzzy
+msgid "Restriction filter"
+msgstr "Поиск"
+
+#: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
+msgid "Restrictions for recipient"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:149
+#: plugins/admin/systems/goImapServer.tpl:76
+msgid "The server must be saved before you can use the status flag."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:151
+#: plugins/admin/systems/goImapServer.tpl:78
+msgid "The service must be saved before you can use the status flag."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:154
+#: plugins/admin/systems/goImapServer.tpl:81
+#, fuzzy
+msgid "Set new status"
+msgstr "Состояние системы"
+
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/systems/goImapServer.tpl:87
+#, fuzzy
+msgid "Set status"
+msgstr "Состояние системы"
+
+#: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
+#, fuzzy
+msgid "Start IMAP service"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
+#, fuzzy
+msgid "Start IMAP SSL service"
+msgstr "Служба SSH"
+
+#: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
+#, fuzzy
+msgid "Start POP3 service"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
+#, fuzzy
+msgid "Start POP3 SSL service"
+msgstr "Служба SSH"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:26
+#, fuzzy
+msgid "Logging service"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
+#, fuzzy
+msgid "Syslog service"
+msgstr "Сервер системных журналов"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:76
+#, fuzzy, php-format
+msgid "Removing server services/goSysLog with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:94
+#, fuzzy, php-format
+msgid "Saving server services/goSysLog with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:121
+#, php-format
+msgid "Set status flag for server services/goSysLog with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goSyslogServer.inc:204
+#, fuzzy
+msgid "Syslog"
+msgstr "Системные журналы"
+
+#: plugins/admin/systems/class_goFonServer.inc:32
+#, fuzzy
+msgid "VoIP service"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/class_goFonServer.inc:82
+#, fuzzy, php-format
+msgid "Removing server services/gofon with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goFonServer.inc:100
+#, fuzzy, php-format
+msgid "Saving server services/gofon with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goFonServer.inc:127
+#, php-format
+msgid "Set status flag for server services/gofon with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:137
+#, fuzzy, php-format
+msgid "The attribute DB user is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_goFonServer.inc:143
+#, fuzzy, php-format
+msgid ""
+"The attribute local dial prefix is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_goFonServer.inc:146
+#, fuzzy, php-format
+msgid ""
+"The attribute country dial prefix is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/admin/systems/class_goFonServer.inc:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "Сервер шрифтов"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "Каталог"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Учетная запись"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/goLogDB with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:97
+#, fuzzy, php-format
+msgid "Saving server services/goLogDB with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:124
+#, php-format
+msgid "Set status flag for server services/goLogDB with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLogDBServer.inc:215
+#, fuzzy
+msgid "Log"
+msgstr "Имя пользователя"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "отключен"
+
+#: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
+#, fuzzy
+msgid "Kerberos service"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_goKrbServer.inc:49
+#, fuzzy
+msgid "Kerberos kadmin access informations"
+msgstr "Личная информация"
+
+#: plugins/admin/systems/class_goKrbServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gokrb with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goKrbServer.inc:97
+#, fuzzy, php-format
+msgid "Saving server services/gokrb with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goKrbServer.inc:124
+#, php-format
+msgid "Set status flag for server services/gokrb with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goKrbServer.inc:135
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "Значение поля \"Файлы\" некорректно."
+
+#: plugins/admin/systems/class_goKrbServer.inc:138
+#, fuzzy, php-format
+msgid "The specified kerberos admin is empty."
+msgstr "Значение поля \"Файлы\" некорректно."
+
+#: plugins/admin/systems/class_goKrbServer.inc:141
+#, fuzzy, php-format
+msgid "The specified kerberos realm is empty."
+msgstr "Значение поля \"Файлы\" некорректно."
+
+#: plugins/admin/systems/class_goKrbServer.inc:228
+#, fuzzy
+msgid "Realm"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/class_goMailServer.inc:44
+#, fuzzy
+msgid "Mail service (SMTP)"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_goMailServer.inc:482
+#, fuzzy
+msgid "Postfix"
+msgstr "Прокси-сервер"
+
+#: plugins/admin/systems/class_goMailServer.inc:512
+#, fuzzy, php-format
+msgid "Removing server services/mail with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goMailServer.inc:580
+#, fuzzy, php-format
+msgid "Saving server services/mail with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goMailServer.inc:608
+#, php-format
+msgid "Set status flag for server services/mail with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:619
+#, fuzzy
+msgid "Please specify a numeric value for header size limit."
+msgstr "Укажите корректный номер телефона."
+
+#: plugins/admin/systems/class_goMailServer.inc:623
+#, fuzzy
+msgid "Please specify a numeric value for mailbox size limit."
+msgstr "Укажите корректный номер телефона."
+
+#: plugins/admin/systems/class_goMailServer.inc:627
+#, fuzzy
+msgid "Please specify a numeric value for message size limit."
+msgstr "Укажите корректный номер телефона."
+
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+#, fuzzy
+msgid "Transport table"
+msgstr "Время передачи"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+#, fuzzy
+msgid "GLPI database information"
+msgstr "Общая информация о пользователе"
+
+#: plugins/admin/systems/class_goImapServer.inc:48
+#, fuzzy
+msgid "IMAP/POP3 service"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/class_goImapServer.inc:53
+#, fuzzy
+msgid "Repair database"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/class_goImapServer.inc:83
+#, fuzzy
+msgid "Cyrus service"
+msgstr "Звук"
+
+#: plugins/admin/systems/class_goImapServer.inc:112
+#, fuzzy, php-format
+msgid "Removing server services/imap with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goImapServer.inc:130
+#, fuzzy, php-format
+msgid "Saving server services/imap with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/systems/class_goImapServer.inc:158
+#, php-format
+msgid "Set status flag for server services/imap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:168
+#, fuzzy
+msgid "Please specify a server identifier."
+msgstr "Введите корректное имя пользователя!"
+
+#: plugins/admin/systems/class_goImapServer.inc:171
+#, fuzzy
+msgid "Please specify a connect url."
+msgstr "Введите корректное имя пользователя!"
+
+#: plugins/admin/systems/class_goImapServer.inc:174
+#, fuzzy
+msgid "Please specify an admin user."
+msgstr "Введите корректное имя пользователя!"
+
+#: plugins/admin/systems/class_goImapServer.inc:177
+#, fuzzy
+msgid "Please specify a password for the admin user."
+msgstr "Укажите корректный номер телефона."
+
+#: plugins/admin/systems/class_goImapServer.inc:182
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:186
+msgid "The sieve port needs to be numeric."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:273
+#, fuzzy
+msgid "Imap"
+msgstr "Импортировать"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Пароль администратора"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+#, fuzzy
+msgid "FAX database information"
+msgstr "Базы данных"
+
+#: plugins/admin/systems/class_goShareServer.inc:31
+#, fuzzy
+msgid "File service"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_goShareServer.inc:178
+#, php-format
+msgid "Removing of system server/shares with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:212
+#, fuzzy, php-format
+msgid "Saving of system server/shares with dn '%s' failed."
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/admin/systems/class_goShareServer.inc:239
+#, php-format
+msgid "Set status flag for system server/shares with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:287
+#, fuzzy, php-format
+msgid "Creating system server/shares (mount container) with dn '%s' failed."
+msgstr "Объект группы"
+
+#: plugins/admin/systems/class_goShareServer.inc:301
+#, fuzzy, php-format
+msgid "Removing system server/shares (mount container) with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/admin/systems/class_goShareServer.inc:312
+#, fuzzy, php-format
+msgid "Saving system server/shares (mount container) with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/admin/systems/class_goShareServer.inc:449
+#, fuzzy
+msgid "Share service"
+msgstr "Сканер"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "пользователи"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+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/generic.tpl:9
+msgid "Name of the group"
+msgstr "Название группы"
+
+#: plugins/admin/ogroups/generic.tpl:37
+msgid "Member objects"
+msgstr "Включаемые объекты"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:61
+#: plugins/admin/ogroups/tabs_ogroups.inc:166
+#, fuzzy
+msgid "Phone queue"
+msgstr "Номер телефона"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
+#, fuzzy
+msgid "System"
+msgstr "Системы"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:146
+msgid "Terminals"
+msgstr "Терминалы"
+
+#: plugins/admin/ogroups/class_termgroup.inc:118
+msgid "There must be at least one NTP server selected."
+msgstr ""
+
+#: plugins/admin/ogroups/class_termgroup.inc:343
+#, fuzzy, php-format
+msgid "Removing of object group/workstation with dn '%s' failed."
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System 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/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
+#: 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_ogroup.inc:144
+msgid "This 'dn' is no object group."
+msgstr "Этот объект не является группой."
+
+#: plugins/admin/ogroups/class_ogroup.inc:279
+msgid "too many different objects!"
+msgstr "слишком много различных объектов!"
+
+#: plugins/admin/ogroups/class_ogroup.inc:281
+msgid "users"
+msgstr "пользователи"
+
+#: plugins/admin/ogroups/class_ogroup.inc:282
+msgid "groups"
+msgstr "группы"
+
+#: plugins/admin/ogroups/class_ogroup.inc:283
+msgid "applications"
+msgstr "приложения"
+
+#: plugins/admin/ogroups/class_ogroup.inc:284
+msgid "departments"
+msgstr "подразделения"
+
+#: plugins/admin/ogroups/class_ogroup.inc:285
+msgid "servers"
+msgstr "серверы"
+
+#: plugins/admin/ogroups/class_ogroup.inc:286
+msgid "workstations"
+msgstr "рабочие станции"
+
+#: plugins/admin/ogroups/class_ogroup.inc:287
+msgid "terminals"
+msgstr "терминалы"
+
+#: plugins/admin/ogroups/class_ogroup.inc:288
+msgid "phones"
+msgstr "телефоны"
+
+#: plugins/admin/ogroups/class_ogroup.inc:289
+msgid "printers"
+msgstr "принтеры"
+
+#: plugins/admin/ogroups/class_ogroup.inc:296
+msgid "and"
+msgstr "и"
+
+#: plugins/admin/ogroups/class_ogroup.inc:508
+#, fuzzy
+msgid "Non existing dn:"
+msgstr "Не существующий dn:"
+
+#: plugins/admin/ogroups/class_ogroup.inc:649
+#, fuzzy
+msgid "There is already an object with this cn."
+msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
+
+#: plugins/admin/ogroups/class_ogroup.inc:666
+msgid "You can combine two different object types at maximum only!"
+msgstr ""
+"Вы можете комбинировать не более двух различных классов в одном объекте!"
+
+#: plugins/admin/ogroups/class_ogroup.inc:715
+#, fuzzy, php-format
+msgid "Saving of object group/generic with dn '%s' failed."
+msgstr "Моя учетная запись"
+
+#: plugins/admin/ogroups/class_ogroup.inc:728
+#, fuzzy, php-format
+msgid "Removing of object group/generic with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Объект группы"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Включаемые объекты"
+
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
+"сможет восстановить эти данные."
+
+#: plugins/admin/ogroups/phonequeue.tpl:1
+#, fuzzy
+msgid "Queue Settings"
+msgstr "Настройки Samba"
+
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+#: plugins/gofon/phoneaccount/paste_generic.tpl:2
+#: plugins/gofon/phoneaccount/paste_generic.tpl:6
+msgid "Phone numbers"
+msgstr "Телефонные номера"
+
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:96
+#, fuzzy
+msgid "Generic queue Settings"
+msgstr "Общая информация о пользователе"
+
+#: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
+#, fuzzy
+msgid "Timeout"
+msgstr "Таймаут (с)"
+
+#: plugins/admin/ogroups/phonequeue.tpl:62
+#, fuzzy
+msgid "Strategy"
+msgstr "Адм. единица"
+
+#: plugins/admin/ogroups/phonequeue.tpl:74
+#: plugins/admin/ogroups/class_phonequeue.inc:718
+msgid "Max queue length"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:82
+#: plugins/admin/ogroups/class_phonequeue.inc:719
+msgid "Announce frequency"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:86
+msgid "(in seconds)"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:94
+msgid "Queue sound setup"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:99
+msgid "Use music on hold instead of ringing"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
+msgid "Music on hold"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:116
+#, fuzzy
+msgid "Welcome sound file"
+msgstr "Добро пожаловать %s!"
+
+#: plugins/admin/ogroups/phonequeue.tpl:124
+#, fuzzy
+msgid "Announce message"
+msgstr "Сообщение автоответчика"
+
+#: plugins/admin/ogroups/phonequeue.tpl:132
+msgid "Sound file for 'You are next ...'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "'There are ...'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:148
+msgid "'... calls waiting'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:156
+#, fuzzy
+msgid "'Thank you' message"
+msgstr "Сообщение о состоянии"
+
+#: plugins/admin/ogroups/phonequeue.tpl:164
+msgid "'minutes' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:172
+msgid "'seconds' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:180
+msgid "Hold sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:188
+#, fuzzy
+msgid "Less Than sound file"
+msgstr "Добро пожаловать %s!"
+
+#: plugins/admin/ogroups/phonequeue.tpl:204
+#, fuzzy
+msgid "Phone attributes "
+msgstr "Атрибут DN пользователей"
+
+#: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
+msgid "Announce holdtime"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
+msgid "Allow the called user to transfer his call"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
+msgid "Allows calling user to transfer call"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
+msgid "Allow the called to hangup by pressing *"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
+msgid "Allows calling to hangup by pressing *"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
+msgid "Ring instead of playing background music"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:11
+#, fuzzy
+msgid "Primary mail address for this distribution list"
+msgstr "Основной адрес эл. почты для этой общей папки"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:41
 #, 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"
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+#, fuzzy
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:98
+#, fuzzy, php-format
+msgid "Saving of object group/mail with dn '%s' failed."
+msgstr "Моя учетная запись"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:131
+#, fuzzy, php-format
+msgid "Removing of object group/mail with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "Основная группа"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:79
+#, fuzzy
+msgid "ring all"
+msgstr "Терминалы"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:80
+msgid "round robin"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:81
+msgid "least recently called"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:82
+msgid "fewest completed calls"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+#, fuzzy
+msgid "random"
+msgstr "и"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+msgid "round robin with memory"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+#, fuzzy
+msgid "Remove the phone queue from this Account"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:114
+#, fuzzy
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
+msgstr ""
+"В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
+"щелкнув ниже."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:116
+#, fuzzy
+msgid "Create phone queue"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:117
+#, fuzzy
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
+"щелкнув ниже."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:201
+msgid "Timeout must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:204
+msgid "Retry must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:207
+msgid "Max queue length must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:210
+msgid "Announce frequency must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+msgid "There must be least one queue number defined."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:227
+msgid ""
+"There is currently no asterisk server defined. Your settings can't be saved."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:240
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:271
+#, php-format
+msgid ""
+"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:625
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:87
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1049
+#: plugins/gofon/macro/class_gofonMacro.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:282
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:398
+#, fuzzy, php-format
+msgid "Can't select database %s on %s."
+msgstr "Невозможно выбрать базу данных!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:281
+#: plugins/admin/ogroups/class_phonequeue.inc:495
+#: plugins/admin/ogroups/class_phonequeue.inc:661
+#, fuzzy, php-format
+msgid "Can't delete in Database %s, on Server %s."
+msgstr "Невозможно выбрать базу данных!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:525
+#: plugins/admin/ogroups/class_phonequeue.inc:527
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1156
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:438
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:440
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:587
+#, fuzzy, php-format
+msgid "Saving of object group/phone queue with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:615
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:80
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/macro/class_gofonMacro.inc:236
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
 msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:283
-#: plugins/admin/systems/class_printGeneric.inc:286
-#, fuzzy
-msgid "Remove printer extension"
-msgstr "Удалить параметры"
+#: plugins/admin/ogroups/class_phonequeue.inc:684
+#, fuzzy, php-format
+msgid "Removing of object group/phone queue with dn '%s' failed."
+msgstr "Почтовые настройки пользователя"
 
-#: plugins/admin/systems/class_printGeneric.inc:284
+#: plugins/admin/ogroups/class_phonequeue.inc:709
 #, fuzzy
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+msgid "Phone group"
+msgstr "Члены телефонной группы"
 
-#: plugins/admin/systems/class_printGeneric.inc:287
+#: plugins/admin/ogroups/class_phonequeue.inc:727
 #, fuzzy
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+msgid "Welcome music"
+msgstr "Добро пожаловать %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
 msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
 msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:295
-#, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
 msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
 
-#: plugins/admin/systems/class_printGeneric.inc:467
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:475
+#: plugins/admin/ogroups/class_phonequeue.inc:732
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
+msgid "'Thank you' sound"
+msgstr "СообÑ\89ение о Ñ\81оÑ\81Ñ\82оÑ\8fнии"
 
-#: plugins/admin/systems/class_printGeneric.inc:488
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+msgid "'Minutes' sound"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:490
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+#, fuzzy
+msgid "'Seconds' sound"
+msgstr "Добро пожаловать %s!"
 
-#: plugins/admin/systems/class_printGeneric.inc:735
-#: plugins/admin/systems/class_printGeneric.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:592
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Группа"
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+#, fuzzy
+msgid "'Less than' sound"
+msgstr "Добро пожаловать %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Телефонные номера"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Сообщение автоответчика"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:39
+#, fuzzy
+msgid "List of object groups"
+msgstr "Название группы"
 
-#: plugins/admin/ogroups/headpage.tpl:24
+#: plugins/admin/ogroups/class_divListOGroup.inc:44
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with a "
+"use the range selector on top of the group listbox, when working with  a "
 "large number of groups."
 msgstr ""
 "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
 "группы пользователей. Если у вас их достаточно большое количество, вы можете "
 "использовать групповое выделение."
 
-#: plugins/admin/ogroups/headpage.tpl:39
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Название группы"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+#, fuzzy
+msgid "Select to see groups containing users"
+msgstr "Показать группы с пользователями"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
 msgid "Show groups containing users"
 msgstr "Показать группы с пользователями"
 
-#: plugins/admin/ogroups/headpage.tpl:40
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+#, fuzzy
+msgid "Select to see groups containing groups"
+msgstr "Показать группы с группами"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
 msgid "Show groups containing groups"
 msgstr "Показать группы с группами"
 
-#: plugins/admin/ogroups/headpage.tpl:41
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+#, fuzzy
+msgid "Select to see groups containing applications"
+msgstr "Показать группы с приложениями"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
 msgid "Show groups containing applications"
 msgstr "Показать группы с приложениями"
 
-#: plugins/admin/ogroups/headpage.tpl:42
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+#, fuzzy
+msgid "Select to see groups containing departments"
+msgstr "Показать группы с подразделениями"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
 msgid "Show groups containing departments"
 msgstr "Показать группы с подразделениями"
 
-#: plugins/admin/ogroups/headpage.tpl:43
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+#, fuzzy
+msgid "Select to see groups containing servers"
+msgstr "Показать группы с серверами"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
 msgid "Show groups containing servers"
 msgstr "Показать группы с серверами"
 
-#: plugins/admin/ogroups/headpage.tpl:44
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+#, fuzzy
+msgid "Select to see groups containing workstations"
+msgstr "Показать группы с рабочими станциями"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
 msgid "Show groups containing workstations"
 msgstr "Показать группы с рабочими станциями"
 
-#: plugins/admin/ogroups/headpage.tpl:45
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+#, fuzzy
+msgid "Select to see groups containing terminals"
+msgstr "Показать группы с терминалами"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
 msgid "Show groups containing terminals"
 msgstr "Показать группы с терминалами"
 
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+#, fuzzy
+msgid "Select to see groups containing printer"
 msgstr "Показать группы с принтерами"
 
-#: plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
 #, fuzzy
-msgid "Display object groups matching"
-msgstr "Показать совпадения объектов"
-
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Название группы"
-
-#: plugins/admin/ogroups/generic.tpl:33
-msgid "Member objects"
-msgstr "Включаемые объекты"
+msgid "Show groups containing printer"
+msgstr "Показать группы с принтерами"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:58
-#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
 #, fuzzy
-msgid "Phone queue"
-msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
+msgid "Select to see groups containing phones"
+msgstr "Ð\9fоказаÑ\82Ñ\8c гÑ\80Ñ\83ппÑ\8b Ñ\81 пÑ\80инÑ\82еÑ\80ами"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:83
-#: plugins/admin/ogroups/tabs_ogroups.inc:130
-msgid "Terminals"
-msgstr "ТеÑ\80миналÑ\8b"
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+#, fuzzy
+msgid "Show groups containing phones"
+msgstr "Ð\9fоказаÑ\82Ñ\8c гÑ\80Ñ\83ппÑ\8b Ñ\81 пÑ\80инÑ\82еÑ\80ами"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
-msgstr "Выберите подразделение"
+#: plugins/admin/ogroups/class_divListOGroup.inc:115
+#, fuzzy
+msgid "Create new object group"
+msgstr "Объект группы"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
-msgstr "Показать подразделения"
+#: plugins/admin/ogroups/class_divListOGroup.inc:178
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Объект группы"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
-msgstr "Выберите чтобы посмотреть пользователей GOsa"
+#: plugins/admin/acl/class_aclManagement.inc:25
+#, fuzzy
+msgid "ACLs"
+msgstr "Доступ"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Show people"
-msgstr "Показать людей"
+#: plugins/admin/acl/class_aclManagement.inc:159
+#, fuzzy, php-format
+msgid "You're about to delete the acl %s."
+msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see GOsa groups"
-msgstr "Выберите чтобы посмотреть группы GOsa"
+#: plugins/admin/acl/class_aclManagement.inc:165
+#: plugins/admin/acl/class_aclManagement.inc:191
+#, fuzzy
+msgid "You are not allowed to delete this acl!"
+msgstr "У вас недостаточно прав для удаления этой группы!"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Show groups"
-msgstr "Показать группы"
+#: plugins/admin/acl/class_divListACL.inc:31
+#, fuzzy
+msgid "List of acl"
+msgstr "Список групп"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Select to see applications"
-msgstr "Выберите чтобы посмотреть приложения"
+#: plugins/admin/acl/class_divListACL.inc:32
+#, fuzzy
+msgid "List of acls"
+msgstr "Список групп"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Show applications"
-msgstr "Показать приложения"
+#: plugins/admin/acl/class_divListACL.inc:36
+#, fuzzy
+msgid "This menu allows you to edit and delete selected acls."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные стоп-"
+"листы. Если у вас достаточно большое количество списков, вы можете "
+"использовать групповое выделение."
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
-msgstr "Выберите чтобы посмотреть рабочие станции"
+#: plugins/admin/acl/class_divListACL.inc:61
+#, fuzzy
+msgid "Display acls matching"
+msgstr "Шаблон для групп"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Select to see terminals"
-msgstr "Выберите чтобы посмотреть терминалы"
+#: plugins/admin/acl/class_divListACL.inc:109
+#, fuzzy
+msgid "Acl"
+msgstr "Все"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Select to see printers"
-msgstr "Выберите чтобы посмотреть принтеры"
+#: plugins/admin/acl/class_divListACL.inc:153
+#, fuzzy
+msgid "Select to display users"
+msgstr "Выберите, чтобы просмотреть пользователей"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Show printers"
-msgstr "Показать принтеры"
+#: plugins/admin/acl/class_divListACL.inc:153
+#, fuzzy
+msgid "Display user"
+msgstr "Отображаемое имя"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Select to see phones"
-msgstr "Выберите чтобы посмотреть телефоны"
+#: plugins/admin/acl/class_divListACL.inc:155
+#, fuzzy
+msgid "Select to display departments"
+msgstr "Выберите подразделение"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
-msgstr "Показать объекты подразделения"
+#: plugins/admin/acl/class_divListACL.inc:155
+#, fuzzy
+msgid "Display departments"
+msgstr "Подразделения в подразделении"
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
+#: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
+#, fuzzy
+msgid "ACL management"
+msgstr "Управление подразделениями"
 
-#: plugins/admin/ogroups/termgroup.tpl:7
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
 #, fuzzy
-msgid "Select action to execute for this   group of terminals"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е дейÑ\81Ñ\82вие, коÑ\82оÑ\80ое нÑ\83жно вÑ\8bполниÑ\82Ñ\8c на Ñ\8dÑ\82ом Ñ\82еÑ\80минале"
+msgid "Objects"
+msgstr "Ð\9eбÑ\8aекÑ\82"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Ð\9eбÑ\8aединениÑ\8f"
+#: plugins/admin/fai/faiVariable.tpl:34
+#, fuzzy
+msgid "List of assigned variables"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr "UNIX аккаунт"
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Серверы"
+#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
+#, fuzzy
+msgid "Fully Automatic Installation"
+msgstr "Управление приложениями"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr "Тонкие клиенты"
+#: plugins/admin/fai/class_faiScript.inc:364
+#, fuzzy, php-format
+msgid "Creating of FAI/script with dn '%s' failed."
+msgstr "Объект группы"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr "Рабочие станции"
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+#, fuzzy
+msgid "FAI script"
+msgstr "Показать хосты"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:287
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Ð\92Ñ\8b Ñ\81обиÑ\80аеÑ\82еÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c гÑ\80Ñ\83пповой обÑ\8aекÑ\82 \"%s\"."
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Ð\9fÑ\83Ñ\82Ñ\8c к Ñ\81Ñ\86енаÑ\80иÑ\8fм"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:293
-#: plugins/admin/ogroups/class_ogroupManagement.inc:319
-msgid "You are not allowed to delete this object group!"
-msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\83далениÑ\8f Ñ\8dÑ\82ого гÑ\80Ñ\83ппового обÑ\8aекÑ\82а!"
+#: plugins/admin/fai/class_faiTemplate.inc:336
+#, fuzzy, php-format
+msgid "Saving of FAI/template with dn '%s' failed."
+msgstr "СпиÑ\81ок подÑ\80азделений"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:457
+#: plugins/admin/fai/class_faiTemplate.inc:415
 #, fuzzy
-msgid "Create new object group"
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
+msgid "FAI template"
+msgstr "СоздаÑ\82Ñ\8c Ñ\88аблон"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/fai/class_faiTemplate.inc:424
 #, fuzzy
-msgid "Name of object groups"
-msgstr "Название группы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:550
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Объект группы"
-
-#: plugins/admin/ogroups/class_ogroup.inc:144
-msgid "This 'dn' is no object group."
-msgstr "Этот объект не является группой."
+msgid "Template file"
+msgstr "Шаблон"
 
-#: plugins/admin/ogroups/class_ogroup.inc:279
-msgid "too many different objects!"
-msgstr "слишком много различных объектов!"
+#: plugins/admin/fai/class_faiTemplate.inc:425
+#, fuzzy
+msgid "Template path"
+msgstr "Шаблон"
 
-#: plugins/admin/ogroups/class_ogroup.inc:281
-msgid "users"
-msgstr "пользователи"
+#: plugins/admin/fai/class_faiTemplate.inc:426
+#, fuzzy
+msgid "File owner"
+msgstr "Имя сервера"
 
-#: plugins/admin/ogroups/class_ogroup.inc:282
-msgid "groups"
-msgstr "группы"
+#: plugins/admin/fai/class_faiTemplate.inc:427
+#, fuzzy
+msgid "File permissions"
+msgstr "Права для членов группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:283
-msgid "applications"
-msgstr "приложения"
+#: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
+#, fuzzy
+msgid "FAI"
+msgstr "Идентификатор факса"
 
-#: plugins/admin/ogroups/class_ogroup.inc:284
-msgid "departments"
-msgstr "подразделения"
+#: plugins/admin/fai/class_faiManagement.inc:34
+#, fuzzy
+msgid "Fully Automatic Installation - management"
+msgstr "Управление приложениями"
 
-#: plugins/admin/ogroups/class_ogroup.inc:285
-msgid "servers"
-msgstr "серверы"
+#: plugins/admin/fai/class_faiManagement.inc:154
+#, fuzzy, php-format
+msgid "You're about to delete all information about the FAI class at '%s'."
+msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
 
-#: plugins/admin/ogroups/class_ogroup.inc:286
-msgid "workstations"
-msgstr "рабочие станции"
+#: plugins/admin/fai/class_faiManagement.inc:204
+#, php-format
+msgid ""
+"Release cleanup : Removing object (tagged as remvoed) that is no longer in "
+"use '%s'."
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:287
-msgid "terminals"
-msgstr "терминалы"
+#: plugins/admin/fai/class_faiManagement.inc:264
+#, fuzzy, php-format
+msgid "You're about to delete a fai branch / freeze  '%s'."
+msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/admin/ogroups/class_ogroup.inc:288
-msgid "phones"
-msgstr "телефоны"
+#: plugins/admin/fai/class_faiManagement.inc:267
+#, fuzzy
+msgid "You are not allowed to delete this release!"
+msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
-msgid "printers"
-msgstr "принтеры"
+#: plugins/admin/fai/class_faiManagement.inc:322
+#, fuzzy
+msgid "Specified branch name is invalid."
+msgstr "Указанное имя уже используется."
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-msgid "and"
-msgstr "и"
+#: plugins/admin/fai/class_faiManagement.inc:324
+#, fuzzy
+msgid "Specified freeze name is invalid."
+msgstr "Указанное имя уже используется."
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
 #, fuzzy
-msgid "Non existing dn:"
-msgstr "Ð\9dе Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83Ñ\8eÑ\89ий dn:"
+msgid "Management"
+msgstr "Ð\9dазвание"
 
-#: plugins/admin/ogroups/class_ogroup.inc:649
+#: plugins/admin/fai/class_faiManagement.inc:809
 #, fuzzy
-msgid "There is already an object with this cn."
-msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
+msgid "FAI management"
+msgstr "Управление подразделениями"
 
-#: plugins/admin/ogroups/class_ogroup.inc:666
-msgid "You can combine two different object types at maximum only!"
-msgstr ""
-"Вы можете комбинировать не более двух различных классов в одном объекте!"
+#: plugins/admin/fai/faiPackage.tpl:49
+#, fuzzy
+msgid "Install method"
+msgstr "Почтовые настройки"
 
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-"сможет восстановить эти данные."
+#: plugins/admin/fai/faiPackage.tpl:65
+#, fuzzy
+msgid "Used packages"
+msgstr "Показать телефоны"
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
+#: plugins/admin/fai/faiPackage.tpl:67
 #, fuzzy
-msgid "Queue Settings"
-msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Samba"
+msgid "Choosen packages"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82елеÑ\84онÑ\8b"
 
-#: plugins/admin/ogroups/phonequeue.tpl:4
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-#: plugins/gofon/phoneaccount/paste_generic.tpl:2
-#: plugins/gofon/phoneaccount/paste_generic.tpl:6
-msgid "Phone numbers"
-msgstr "Телефонные номера"
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:669
+msgid "Configure"
+msgstr "Настроить"
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:96
+#: plugins/admin/fai/faiPackage.tpl:74
 #, fuzzy
-msgid "Generic queue Settings"
-msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
+msgid "Toggle remove flag"
+msgstr "по Ñ\83молÑ\87аниÑ\8e"
 
-#: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/fai/remove.tpl:7
 #, fuzzy
-msgid "Timeout"
-msgstr "Таймаут (с)"
+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/ogroups/phonequeue.tpl:62
+#: plugins/admin/fai/faiPartitionTable.tpl:34
 #, fuzzy
-msgid "Strategy"
-msgstr "Ð\90дм. единиÑ\86а"
+msgid "Discs"
+msgstr "УÑ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
 
-#: plugins/admin/ogroups/phonequeue.tpl:74
-msgid "Max queue length"
+#: plugins/admin/fai/faiPartitionTable.tpl:40
+msgid "Choose a disk to delete or edit"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:82
-msgid "Announce frequency"
+#: plugins/admin/fai/faiProfileEntry.tpl:6
+msgid "List of FAI objects (Fully Automatic Installation)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:86
-msgid "(in seconds)"
+#: plugins/admin/fai/faiProfileEntry.tpl:26
+msgid ""
+"This menu allows you to select FAI class names and to add them to the "
+"currently edited profile."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:94
-msgid "Queue sound setup"
+#: plugins/admin/fai/faiProfileEntry.tpl:39
+#, fuzzy
+msgid "Show only classes with templates"
+msgstr "Показать шаблоны"
+
+#: plugins/admin/fai/faiProfileEntry.tpl:41
+msgid "Show only classes with scripts"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:99
-msgid "Use music on hold instead of ringing"
+#: plugins/admin/fai/faiProfileEntry.tpl:43
+msgid "Show only classes with hooks"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:108
-msgid "Music on hold"
+#: plugins/admin/fai/faiProfileEntry.tpl:45
+#, fuzzy
+msgid "Show only classes with variables"
+msgstr "Показать терминалы"
+
+#: plugins/admin/fai/faiProfileEntry.tpl:47
+msgid "Show only classes with packages"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:116
+#: plugins/admin/fai/faiProfileEntry.tpl:49
 #, fuzzy
-msgid "Welcome sound file"
-msgstr "Ð\94обÑ\80о пожаловаÑ\82Ñ\8c %s!"
+msgid "Show only classes with partitions"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\80абоÑ\87ие Ñ\81Ñ\82анÑ\86ии"
 
-#: plugins/admin/ogroups/phonequeue.tpl:124
+#: plugins/admin/fai/class_faiScriptEntry.inc:68
+#: plugins/admin/fai/class_faiHookEntry.inc:71
 #, fuzzy
-msgid "Announce message"
-msgstr "СообÑ\89ение авÑ\82ооÑ\82веÑ\82Ñ\87ика"
+msgid "Please select a valid file."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
 
-#: plugins/admin/ogroups/phonequeue.tpl:132
-msgid "Sound file for 'You are next ...'"
-msgstr ""
+#: plugins/admin/fai/class_faiScriptEntry.inc:71
+#: plugins/admin/fai/class_faiHookEntry.inc:74
+#, fuzzy
+msgid "Selected file is empty."
+msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/admin/ogroups/phonequeue.tpl:140
-msgid "'There are ...'"
-msgstr ""
+#: plugins/admin/fai/class_faiScriptEntry.inc:133
+#: plugins/admin/fai/class_faiVariableEntry.inc:102
+#: plugins/admin/fai/class_faiHookEntry.inc:147
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#, fuzzy
+msgid "Please enter a name."
+msgstr "Введите адрес сервера"
 
-#: plugins/admin/ogroups/phonequeue.tpl:148
-msgid "'... calls waiting'"
-msgstr ""
+#: plugins/admin/fai/class_faiScriptEntry.inc:137
+#, fuzzy
+msgid "Please enter a script."
+msgstr "Введите корректный серийный номер"
 
-#: plugins/admin/ogroups/phonequeue.tpl:156
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/admin/fai/faiScriptEntry.tpl:48
 #, fuzzy
-msgid "'Thank you' message"
-msgstr "СообÑ\89ение о Ñ\81оÑ\81Ñ\82оÑ\8fнии"
+msgid "Script attributes"
+msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
 
-#: plugins/admin/ogroups/phonequeue.tpl:164
-msgid "'minutes' sound file"
-msgstr ""
+#: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
+#, fuzzy
+msgid "Choose a priority"
+msgstr "Выберите тип мыши"
 
-#: plugins/admin/ogroups/phonequeue.tpl:172
-msgid "'seconds' sound file"
+#: plugins/admin/fai/faiScriptEntry.tpl:63
+#: plugins/admin/fai/faiHookEntry.tpl:63
+#, fuzzy
+msgid "Import script"
+msgstr "Показать хосты"
+
+#: plugins/admin/fai/class_faiPackage.inc:392
+#, fuzzy
+msgid "Please select a least one Package."
+msgstr "Введите корректный номер телефона!"
+
+#: plugins/admin/fai/class_faiPackage.inc:396
+#, fuzzy
+msgid "Please choose a valid combination for your repository setup."
+msgstr "Укажите корректный номер телефона."
+
+#: plugins/admin/fai/class_faiPackage.inc:417
+#, fuzzy
+msgid "package is configured"
+msgstr "Не настроено"
+
+#: plugins/admin/fai/class_faiPackage.inc:423
+msgid "Package marked for removal"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:180
-msgid "Hold sound file"
+#: plugins/admin/fai/class_faiPackage.inc:450
+#, php-format
+msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:188
+#: plugins/admin/fai/class_faiPackage.inc:494
+#, fuzzy, php-format
+msgid "Saving of FAI/package list with dn '%s' failed."
+msgstr "Дополнительные записи в fstab"
+
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #, fuzzy
-msgid "Less Than sound file"
-msgstr "Ð\94обÑ\80о пожаловаÑ\82Ñ\8c %s!"
+msgid "Package"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82елеÑ\84онÑ\8b"
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
+#: plugins/admin/fai/class_faiPackage.inc:541
 #, fuzzy
-msgid "Phone attributes "
-msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
+msgid "FAI Package list"
+msgstr "ЧиÑ\81ло Ñ\81Ñ\82Ñ\80аниÑ\86"
 
-#: plugins/admin/ogroups/phonequeue.tpl:212
-msgid "Announce holdtime"
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Почтовые настройки"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
+#: plugins/admin/fai/class_faiProfileEntry.inc:152
+msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
-msgid "Allow the called user to transfer his call"
+#: plugins/admin/fai/class_faiProfile.inc:288
+#: plugins/admin/fai/class_faiProfileEntry.inc:119
+msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Allows calling user to transfer call"
-msgstr ""
+#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#, fuzzy
+msgid "Template bundle"
+msgstr "Шаблон"
+
+#: plugins/admin/fai/class_faiProfile.inc:290
+#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#, fuzzy
+msgid "Script bundle"
+msgstr "Путь к сценариям"
+
+#: plugins/admin/fai/class_faiProfile.inc:291
+#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#, fuzzy
+msgid "Variable bundle"
+msgstr "Переменная"
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
-msgid "Allow the called to hangup by pressing *"
+#: plugins/admin/fai/class_faiProfile.inc:292
+msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
+#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: plugins/admin/fai/class_faiSummaryTab.inc:43
+#, fuzzy
+msgid "Partition table"
+msgstr "Переменная"
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
-msgid "Ring instead of playing background music"
+#: plugins/admin/fai/class_faiProfile.inc:296
+msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/fai/class_faiProfile.inc:385
+msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
+#: plugins/admin/fai/class_faiProfile.inc:389
 #, fuzzy
-msgid "Primary mail address for this distribution list"
-msgstr "Ð\9eÑ\81новной адÑ\80еÑ\81 Ñ\8dл. поÑ\87Ñ\82Ñ\8b длÑ\8f Ñ\8dÑ\82ой обÑ\89ей папки"
+msgid "Please enter a valid name."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:41
+#: plugins/admin/fai/class_faiProfile.inc:397
 #, fuzzy
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+msgid "There is already a profile with this class name defined."
 msgstr ""
-"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
-"их, щелкнув ниже."
+"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-#, fuzzy
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
-"щелкнув ниже."
+#: plugins/admin/fai/class_faiProfile.inc:420
+#: plugins/admin/fai/class_faiProfile.inc:424
+#, fuzzy, php-format
+msgid "Saving of FAI/profile with dn '%s' failed."
+msgstr "Дополнительные записи в fstab"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:79
+#: plugins/admin/fai/class_faiProfile.inc:432
 #, fuzzy
-msgid "ring all"
-msgstr "ТеÑ\80миналÑ\8b"
+msgid "Profile"
+msgstr "Ð\9fÑ\83Ñ\82Ñ\8c к пÑ\80оÑ\84илÑ\8e"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
-msgid "round robin"
-msgstr ""
+#: plugins/admin/fai/class_faiProfile.inc:433
+#, fuzzy
+msgid "FAI profile"
+msgstr "Управление системами"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
-msgid "least recently called"
-msgstr ""
+#: plugins/admin/fai/class_faiHook.inc:392
+#, fuzzy, php-format
+msgid "Saving of FAI/hook with dn '%s' failed."
+msgstr "Атрибуты UNIX"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:82
-msgid "fewest completed calls"
+#: plugins/admin/fai/class_faiHook.inc:474
+msgid "Hook"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
+#: plugins/admin/fai/class_faiHook.inc:475
 #, fuzzy
-msgid "random"
-msgstr "и"
+msgid "FAI hook"
+msgstr "Ð\9eÑ\88ибка LDAP:"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:84
-msgid "round robin with memory"
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
-msgid "Remove the phone queue from this Account"
-msgstr "УдалиÑ\82Ñ\8c Ñ\82елеÑ\84оннÑ\8bй аккаÑ\83нÑ\82"
+msgid "primary"
+msgstr "Ð\9eÑ\81новнаÑ\8f гÑ\80Ñ\83ппа"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:114
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
-msgstr ""
-"В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
-"щелкнув ниже."
+msgid "logical"
+msgstr "Добавить локально"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:116
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 #, fuzzy
-msgid "Create phone queue"
-msgstr "СоздаÑ\82Ñ\8c Ñ\82елеÑ\84оннÑ\8bй аккаÑ\83нÑ\82"
+msgid "FS type"
+msgstr "Тип"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:117
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
+#: plugins/admin/fai/class_faiSummaryTab.inc:308
 #, fuzzy
-msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
-"щелкнув ниже."
+msgid "Mount point"
+msgstr "Мониторинг"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:201
-msgid "Timeout must be numeric"
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/class_faiSummaryTab.inc:307
+#, fuzzy
+msgid "Size in MB"
+msgstr "Пользователь:"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:204
-msgid "Retry must be numeric"
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
+#: plugins/admin/fai/class_faiSummaryTab.inc:306
+#, fuzzy
+msgid "Mount options"
+msgstr "Дополнительные параметры"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:207
-msgid "Max queue length must be numeric"
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+#, fuzzy
+msgid "FS option"
+msgstr "Добавить параметр"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:210
-msgid "Announce frequency must be numeric"
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#, fuzzy
+msgid "Preserve"
+msgstr "серверы"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:213
-msgid "There must be least one queue number defined."
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
+#, php-format
+msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:227
-msgid ""
-"There is currently no asterisk server defined. Your settings can't be saved."
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#, fuzzy, php-format
+msgid "Please enter a valid mount point for partition %s."
+msgstr "Введите корректный путь в поле \"Домашний каталог\"."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:240
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:246
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
 #, php-format
 msgid ""
-"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+"File system type 'swap' is already used, change file system type for "
+"partition %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/admin/ogroups/class_phonequeue.inc:626
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:87
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1047
-#: plugins/gofon/macro/class_gofonMacro.inc:216
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:257
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:373
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
+msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
 #, fuzzy, php-format
-msgid "Can't select database %s on %s."
-msgstr "Ð\9dевозможно вÑ\8bбÑ\80аÑ\82Ñ\8c базÑ\83 даннÑ\8bÑ\85!"
+msgid "Please enter a valid partition size for partition %s."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй пÑ\83Ñ\82Ñ\8c в поле \"Ð\94омаÑ\88ний каÑ\82алог\"."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:281
-#: plugins/admin/ogroups/class_phonequeue.inc:495
-#: plugins/admin/ogroups/class_phonequeue.inc:662
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
 #, fuzzy, php-format
-msgid "Can't delete in Database %s, on Server %s."
-msgstr "Ð\9dевозможно вÑ\8bбÑ\80аÑ\82Ñ\8c базÑ\83 даннÑ\8bÑ\85!"
+msgid "Please enter a valid range for partition %s."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/admin/ogroups/class_phonequeue.inc:527
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1152
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:413
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:415
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
+#, fuzzy, php-format
+msgid "Please enter a range for partition size for partition %s."
+msgstr "Введите корректный серийный номер"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:616
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:80
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
-#: plugins/gofon/macro/class_gofonMacro.inc:205
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:362
-#, php-format
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
 msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
-msgstr ""
-
-#: 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/faiHook.tpl:32
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#, 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"
+"You have more than 3 primary partition table entries in your configuration, "
+"please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
-#, fuzzy
-msgid "Fully Automatic Installation"
-msgstr "Управление приложениями"
-
-#: plugins/admin/fai/class_faiScript.inc:240
-#: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_faiHookEntry.inc:84
-#, fuzzy
-msgid "Download"
-msgstr "Домен"
-
-#: plugins/admin/fai/class_faiManagement.inc:32
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #, fuzzy
-msgid "FAI"
-msgstr "Ð\98денÑ\82иÑ\84икаÑ\82оÑ\80 Ñ\84акÑ\81а"
+msgid "Device"
+msgstr "УÑ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
 
-#: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
 #, fuzzy
-msgid "Fully Automatic Installation - management"
-msgstr "Управление приложениями"
-
-#: plugins/admin/fai/class_faiManagement.inc:228
-#, 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:324
-#, fuzzy, php-format
-msgid "You're about to delete a fai branch / freeze  '%s'."
-msgstr "Вы собираетесь удалить группу \"%s\"."
+msgid "Partition entries"
+msgstr "Переменная"
 
-#: plugins/admin/fai/class_faiManagement.inc:327
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
 #, fuzzy
-msgid "You are not allowed to delete this release!"
-msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\83далениÑ\8f Ñ\8dÑ\82ого полÑ\8cзоваÑ\82елÑ\8f!"
+msgid "Add partition"
+msgstr "Ð\94обавиÑ\82Ñ\8c паÑ\80амеÑ\82Ñ\80"
 
-#: plugins/admin/fai/class_faiManagement.inc:383
+#: plugins/admin/fai/faiScript.tpl:36
 #, fuzzy
-msgid "Specified branch name is invalid."
-msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
+msgid "List of scripts"
+msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
 
-#: plugins/admin/fai/class_faiManagement.inc:385
+#: plugins/admin/fai/class_faiVariableEntry.inc:98
 #, fuzzy
-msgid "Specified freeze name is invalid."
-msgstr "Указанное имÑ\8f Ñ\83же иÑ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f."
+msgid "Please specify a value for the attribute 'content'."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/fai/class_faiManagement.inc:655
+#: plugins/admin/fai/faiVariableEntry.tpl:29
 #, fuzzy
-msgid "New profile"
-msgstr "УпÑ\80авление Ñ\81иÑ\81Ñ\82емами"
+msgid "Variable attributes"
+msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 #, fuzzy
-msgid "New partition table"
-msgstr "Принтер"
+msgid "Variable content"
+msgstr "Переменная"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
-msgid "PT"
-msgstr ""
+#: plugins/admin/fai/faiTemplate.tpl:31
+#, fuzzy
+msgid "List of template files"
+msgstr "Список подразделений"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
+#: plugins/admin/fai/faiSummary.tpl:4
 #, fuzzy
-msgid "New scripts"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\85оÑ\81Ñ\82Ñ\8b"
+msgid "FAI object tree"
+msgstr "Ð\98мÑ\8f обÑ\8aекÑ\82а"
 
-#: plugins/admin/fai/class_faiManagement.inc:663
-msgid "S"
+#: plugins/admin/fai/faiSummary.tpl:9
+msgid "Reload class and release configuration from parent object."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:666
+#: plugins/admin/fai/faiHook.tpl:36
 #, fuzzy
-msgid "New hooks"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\85осты"
+msgid "List of hook scripts"
+msgstr "СÑ\82оп-листы"
 
-#: plugins/admin/fai/class_faiManagement.inc:666
-msgid "H"
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTable.inc:284
+#: plugins/admin/fai/class_faiPartitionTable.inc:290
+#, fuzzy, php-format
+msgid "%s partition"
+msgstr "Показать рабочие станции"
 
-#: plugins/admin/fai/class_faiManagement.inc:669
-#, fuzzy
-msgid "New variables"
-msgstr "Показать терминалы"
+#: plugins/admin/fai/class_faiPartitionTable.inc:286
+#: plugins/admin/fai/class_faiPartitionTable.inc:292
+#, fuzzy, php-format
+msgid "%s partition(s)"
+msgstr "Показать рабочие станции"
 
-#: plugins/admin/fai/class_faiManagement.inc:669
-msgid "V"
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTable.inc:375
+#, fuzzy, php-format
+msgid "Saving of FAI/partition table with dn '%s' failed."
+msgstr "Дополнительные записи в fstab"
 
-#: plugins/admin/fai/class_faiManagement.inc:672
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
 #, fuzzy
-msgid "New templates"
-msgstr "Создать шаблон"
-
-#: plugins/admin/fai/class_faiManagement.inc:672
-msgid "T"
-msgstr ""
+msgid "FAI partition table"
+msgstr "Принтер"
 
-#: plugins/admin/fai/class_faiManagement.inc:675
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
 #, fuzzy
-msgid "New package list"
-msgstr "ЧиÑ\81ло Ñ\81Ñ\82Ñ\80аниÑ\86"
+msgid "Partition type"
+msgstr "Ð\9fеÑ\80еменнаÑ\8f"
 
-#: plugins/admin/fai/class_faiManagement.inc:675
-msgid "PK"
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Назначение"
 
-#: plugins/admin/fai/class_faiManagement.inc:693
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
 #, fuzzy
-msgid "Name of FAI class"
-msgstr "Ð\98мÑ\8f Ñ\81Ñ\82оп-лиÑ\81Ñ\82а"
+msgid "File system type"
+msgstr "СиÑ\81Ñ\82емÑ\8b"
 
-#: plugins/admin/fai/class_faiManagement.inc:694
-msgid "Class type"
-msgstr ""
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+#, fuzzy
+msgid "Partition size"
+msgstr "Назначение"
 
-#: plugins/admin/fai/class_faiManagement.inc:698
-#: plugins/admin/fai/class_faiManagement.inc:799
-#: plugins/admin/fai/class_faiManagement.inc:804
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
 #, fuzzy
-msgid "Edit class"
-msgstr "СпиÑ\81ок Ñ\81иÑ\81Ñ\82ем"
+msgid "File system options"
+msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
 
-#: plugins/admin/fai/class_faiManagement.inc:699
-#: plugins/admin/fai/class_faiManagement.inc:806
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
 #, fuzzy
-msgid "Delete class"
-msgstr "УдалиÑ\82Ñ\8c"
+msgid "Partition flags"
+msgstr "Ð\9dазнаÑ\87ение"
 
-#: plugins/admin/fai/class_faiManagement.inc:740
-#: plugins/admin/fai/class_faiManagement.inc:741
-#: plugins/admin/fai/class_faiProfile.inc:297
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: plugins/admin/fai/class_faiHookEntry.inc:143
 #, fuzzy
-msgid "Partition table"
-msgstr "Ð\9fеÑ\80еменнаÑ\8f"
+msgid "Please enter a value for script."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
 
-#: plugins/admin/fai/class_faiManagement.inc:747
-#: plugins/admin/fai/class_faiManagement.inc:748
-msgid "Package list"
+#: plugins/admin/fai/class_faiProfileEntry.inc:123
+msgid "Package bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:754
-#: plugins/admin/fai/class_faiManagement.inc:755
-#, fuzzy
-msgid "Scripts"
-msgstr "Путь к сценариям"
-
-#: plugins/admin/fai/class_faiManagement.inc:775
-#: plugins/admin/fai/class_faiManagement.inc:776
+#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 #, fuzzy
-msgid "Profile"
-msgstr "Ð\9fÑ\83Ñ\82Ñ\8c к пÑ\80оÑ\84илÑ\8e"
+msgid "Class name"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
 
-#: plugins/admin/fai/headpage.tpl:6
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
 #, fuzzy
-msgid "List of FAI classes"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
+msgid "Hook attributes"
+msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
 
-#: plugins/admin/fai/headpage.tpl:24
-msgid "This menu allows you to create, delete and edit FAI classes."
+#: plugins/admin/fai/faiHookEntry.tpl:36
+msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:47
+#: plugins/admin/fai/class_askClassName.inc:85
 #, fuzzy
-msgid "Create new branch"
-msgstr "Создание нового обÑ\8aекÑ\82а в"
+msgid "Create new FAI object - partition table."
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/fai/headpage.tpl:51
+#: plugins/admin/fai/class_askClassName.inc:86
 #, fuzzy
-msgid "Create new locked branch"
-msgstr "Создание нового обÑ\8aекÑ\82а в"
+msgid "Create new FAI object - package bundle."
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/fai/headpage.tpl:56
+#: plugins/admin/fai/class_askClassName.inc:87
 #, fuzzy
-msgid "Delete current release"
-msgstr "УдалиÑ\82Ñ\8c"
+msgid "Create new FAI object - script bundle."
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
 
-#: plugins/admin/fai/headpage.tpl:71
+#: plugins/admin/fai/class_askClassName.inc:88
 #, fuzzy
-msgid "Show profiles"
-msgstr "Ð\9fоказаÑ\82Ñ\8c пÑ\80инÑ\82еÑ\80ы"
+msgid "Create new FAI object - variable bundle."
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппы"
 
-#: plugins/admin/fai/headpage.tpl:73
+#: plugins/admin/fai/class_askClassName.inc:89
 #, fuzzy
-msgid "Show scripts"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\85оÑ\81Ñ\82ы"
+msgid "Create new FAI object - hook bundle."
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппы"
 
-#: plugins/admin/fai/headpage.tpl:74
+#: plugins/admin/fai/class_askClassName.inc:90
 #, fuzzy
-msgid "Show hooks"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\85оÑ\81Ñ\82ы"
+msgid "Create new FAI object - profile."
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппы"
 
-#: plugins/admin/fai/headpage.tpl:75
+#: plugins/admin/fai/class_askClassName.inc:91
 #, fuzzy
-msgid "Show variables"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82еÑ\80миналÑ\8b"
+msgid "Create new FAI object - template."
+msgstr "СоздаÑ\82Ñ\8c Ñ\88аблон"
 
-#: plugins/admin/fai/headpage.tpl:76
+#: plugins/admin/fai/class_askClassName.inc:92
 #, fuzzy
-msgid "Show packages"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82елеÑ\84оны"
+msgid "Create new FAI object"
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппы"
 
-#: plugins/admin/fai/headpage.tpl:77
+#: plugins/admin/fai/class_askClassName.inc:146
 #, fuzzy
-msgid "Show partitions"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\80абоÑ\87ие Ñ\81Ñ\82анÑ\86ии"
+msgid "The given class name is empty."
+msgstr "Ð\97наÑ\87ение полÑ\8f \"ФайлÑ\8b\" некоÑ\80Ñ\80екÑ\82но."
 
-#: plugins/admin/fai/remove.tpl:7
+#: plugins/admin/fai/class_askClassName.inc:150
 #, fuzzy
+msgid "The specified class name is already in use for this object type."
+msgstr "Группа с таким именем уже существует."
+
+#: plugins/admin/fai/askClassName.tpl:6
 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."
+"Adding a new class to the FAI management, requires a class name. You have to "
+"specify a unique class name for unique types of FAI classes, while you can "
+"use the same class name for different types of FAI classes. In the laste "
+"case, FAI will automatically enclose all these different class types to one "
+"unique class name."
 msgstr ""
-"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
-"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
-"результаты этой операции."
-
-#: plugins/admin/fai/faiPartitionTable.tpl:34
-#, fuzzy
-msgid "Discs"
-msgstr "Устройства"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:40
-msgid "Choose a disk to delete or edit"
+#: plugins/admin/fai/askClassName.tpl:12
+msgid ""
+"Please use one of the following methods to choose the name for the new FAI "
+"class."
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:6
-msgid "List of FAI objects (Fully Automatic Installation)"
+#: plugins/admin/fai/askClassName.tpl:26
+msgid "Enter FAI class name manually"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:26
-msgid ""
-"This menu allows you to select FAI class names and to add them to the "
-"currently edited profile."
+#: plugins/admin/fai/askClassName.tpl:48
+msgid "Choose FAI class name from a list of existing classes"
 msgstr ""
 
-#: plugins/admin/fai/faiProfileEntry.tpl:39
+#: plugins/admin/fai/askClassName.tpl:54
 #, fuzzy
-msgid "Show only classes with templates"
-msgstr "Показать шаблоны"
-
-#: plugins/admin/fai/faiProfileEntry.tpl:41
-msgid "Show only classes with scripts"
-msgstr ""
-
-#: plugins/admin/fai/faiProfileEntry.tpl:43
-msgid "Show only classes with hooks"
-msgstr ""
+msgid "Choose class name"
+msgstr "Выберите тип мыши"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:45
+#: plugins/admin/fai/askClassName.tpl:74
 #, fuzzy
-msgid "Show only classes with variables"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82еÑ\80миналÑ\8b"
+msgid "A new class name."
+msgstr "Ð\94оÑ\81Ñ\82Ñ\83пнÑ\8bе пÑ\80иложениÑ\8f"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:47
-msgid "Show only classes with packages"
-msgstr ""
+#: plugins/admin/fai/class_faiVariable.inc:304
+#, fuzzy, php-format
+msgid "Saving of FAI/variable with dn '%s' failed."
+msgstr "Дополнительные записи в fstab"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:49
+#: plugins/admin/fai/class_faiVariable.inc:383
 #, fuzzy
-msgid "Show only classes with partitions"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\80абоÑ\87ие Ñ\81Ñ\82анÑ\86ии"
+msgid "FAI variable"
+msgstr "УÑ\81Ñ\82Ñ\80ойÑ\81Ñ\82во оÑ\82обÑ\80ажениÑ\8f"
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:68
-#: plugins/admin/fai/class_faiHookEntry.inc:71
+#: plugins/admin/fai/class_faiTemplateEntry.inc:88
 #, fuzzy
-msgid "Please select a valid file."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
+msgid "no file uploaded yet"
+msgstr "Файл небÑ\8bл загÑ\80Ñ\83жен"
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:71
-#: plugins/admin/fai/class_faiHookEntry.inc:74
+#: plugins/admin/fai/class_faiTemplateEntry.inc:93
+#, php-format
+msgid "exists in database (size: %s bytes)"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:184
 #, fuzzy
-msgid "Selected file is empty."
-msgstr "Ð\97наÑ\87ение полÑ\8f \"ФайлÑ\8b\" некоÑ\80Ñ\80екÑ\82но."
+msgid "Please specify a value for attribute 'file'."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:133
-#: plugins/admin/fai/class_faiVariableEntry.inc:102
-#: plugins/admin/fai/class_faiHookEntry.inc:147
-#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 #, fuzzy
-msgid "Please enter a name."
-msgstr "Ð\92ведиÑ\82е адÑ\80еÑ\81 Ñ\81еÑ\80веÑ\80а"
+msgid "Please specify a value for attribute 'path'."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:137
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 #, fuzzy
-msgid "Please enter a script."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
+msgid "Please enter a user."
+msgstr "Ð\92ведиÑ\82е адÑ\80еÑ\81 Ñ\81еÑ\80веÑ\80а"
 
-#: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/fai/faiScriptEntry.tpl:48
+#: plugins/admin/fai/class_faiTemplateEntry.inc:199
 #, fuzzy
-msgid "Script attributes"
-msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
+msgid "Please enter a valid user. Only a-z/0-9 are allowed."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f!"
 
-#: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 #, fuzzy
-msgid "Choose a priority"
-msgstr "Выберите тип мыши"
+msgid "Please enter a group."
+msgstr "Введите адрес сервера"
 
-#: plugins/admin/fai/faiScriptEntry.tpl:63
-#: plugins/admin/fai/faiHookEntry.tpl:63
+#: plugins/admin/fai/class_faiTemplateEntry.inc:206
 #, fuzzy
-msgid "Import script"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\85оÑ\81Ñ\82Ñ\8b"
+msgid "Please enter a valid group. Only a-z/0-9 are allowed."
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f!"
 
-#: plugins/admin/fai/class_faiPackage.inc:352
+#: plugins/admin/fai/faiTemplateEntry.tpl:21
 #, fuzzy
-msgid "Please select a least one Package."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она!"
+msgid "Template attributes"
+msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
 
-#: plugins/admin/fai/class_faiPackage.inc:356
+#: plugins/admin/fai/faiTemplateEntry.tpl:35
 #, fuzzy
-msgid "Please choose a valid combination for your repository setup."
-msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+msgid "Save template"
+msgstr "СоздаÑ\82Ñ\8c Ñ\88аблон"
 
-#: plugins/admin/fai/class_faiPackage.inc:377
+#: plugins/admin/fai/faiTemplateEntry.tpl:47
 #, fuzzy
-msgid "package is configured"
-msgstr "Ð\9dе наÑ\81Ñ\82Ñ\80оено"
+msgid "Destination path"
+msgstr "Ð\9dазнаÑ\87ение"
 
-#: plugins/admin/fai/class_faiPackage.inc:401
-#, php-format
-msgid "Package file '%s' does not exist."
+#: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
+#: plugins/gofon/conference/class_divListConferences.inc:53
+msgid "Owner"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:49
+#: plugins/admin/fai/faiTemplateEntry.tpl:80
 #, fuzzy
-msgid "Install method"
-msgstr "Ð\9fоÑ\87Ñ\82овÑ\8bе наÑ\81Ñ\82Ñ\80ойки"
+msgid "Access"
+msgstr "Ð\90дÑ\80еÑ\81"
 
-#: plugins/admin/fai/faiPackage.tpl:65
+#: plugins/admin/fai/faiTemplateEntry.tpl:87
 #, fuzzy
-msgid "Used packages"
-msgstr "Показать телефоны"
+msgid "Read"
+msgstr "чтение"
 
-#: plugins/admin/fai/faiPackage.tpl:67
+#: plugins/admin/fai/faiTemplateEntry.tpl:88
 #, fuzzy
-msgid "Choosen packages"
-msgstr "Показать телефоны"
-
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:571
-msgid "Configure"
-msgstr "Настроить"
+msgid "Write"
+msgstr "запись"
 
-#: plugins/admin/fai/class_faiProfile.inc:289
-#: plugins/admin/fai/class_faiProfileEntry.inc:152
-msgid "This list displays all assigned class names for this profile."
-msgstr ""
+#: plugins/admin/fai/faiTemplateEntry.tpl:91
+#, fuzzy
+msgid "Special"
+msgstr "терминалы"
 
-#: plugins/admin/fai/class_faiProfile.inc:292
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
-msgid "Hook bundle"
-msgstr ""
+#: plugins/admin/fai/faiTemplateEntry.tpl:100
+#, fuzzy
+msgid "SUID"
+msgstr "UID"
 
-#: plugins/admin/fai/class_faiProfile.inc:293
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/faiTemplateEntry.tpl:109
 #, fuzzy
-msgid "Template bundle"
-msgstr "Шаблон"
+msgid "SGID"
+msgstr "GID"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
-#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#: plugins/admin/fai/faiTemplateEntry.tpl:112
 #, fuzzy
-msgid "Script bundle"
-msgstr "Ð\9fÑ\83Ñ\82Ñ\8c к Ñ\81Ñ\86енаÑ\80иÑ\8fм"
+msgid "Others"
+msgstr "ФилÑ\8cÑ\82Ñ\80Ñ\8b"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
-#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#: plugins/admin/fai/faiTemplateEntry.tpl:118
 #, fuzzy
-msgid "Variable bundle"
-msgstr "Ð\9fеÑ\80еменнаÑ\8f"
+msgid "sticky"
+msgstr "СоÑ\81Ñ\82оÑ\8fние"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
-msgid "Packages bundle"
-msgstr ""
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+#, fuzzy
+msgid "Please enter your search string here"
+msgstr "Введите корректный серийный номер"
 
-#: plugins/admin/fai/class_faiProfile.inc:300
-msgid "Remove class from profile"
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:382
-msgid "Please assign at least one class to this  profile."
+#: 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_faiProfile.inc:386
+#: plugins/admin/fai/faiPackageEntry.tpl:6
 #, fuzzy
-msgid "Please enter a valid name."
-msgstr "Введите корректный серийный номер"
+msgid "List of available packages"
+msgstr "Выберите тип мыши"
 
-#: plugins/admin/fai/class_faiProfile.inc:394
-#, fuzzy
-msgid "There is already a profile with this class name defined."
+#: plugins/admin/fai/faiPackageEntry.tpl:26
+msgid ""
+"This menu allows you to select multiple packages to add them to the "
+"currently edited package list."
 msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: plugins/admin/fai/faiProfile.tpl:32
-#, fuzzy
-msgid "FAI classes"
-msgstr "Выберите тип мыши"
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/faiPackageNew.tpl:1
 #, fuzzy
-msgid "FS type"
-msgstr "Тип"
+msgid "Repository settings"
+msgstr "СеÑ\82евÑ\8bе наÑ\81Ñ\82Ñ\80ойки"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
-#, fuzzy
-msgid "Mount point"
-msgstr "Мониторинг"
+#: plugins/admin/fai/faiPackageNew.tpl:3
+msgid ""
+"To add packages to your package list you have to setup the repository "
+"settings first."
+msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
-#, fuzzy
-msgid "Size in MB"
-msgstr "Пользователь:"
+#: plugins/admin/fai/faiPackageNew.tpl:5
+msgid ""
+"Packages are usually stored on different servers called mirrors. These "
+"mirrors have different types of releases (for example woody/sarge/etch), "
+"which finally contain packages sorted by section."
+msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
-#, fuzzy
-msgid "Mount options"
-msgstr "Дополнительные параметры"
+#: plugins/admin/fai/faiPackageNew.tpl:8
+msgid ""
+"Section and release can't be changed in future dialogs, but the mirror can "
+"be changed by editing the entry."
+msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+#: plugins/admin/fai/faiPackageNew.tpl:14
+msgid ""
+"First select the preferred release, then the section and finally the mirror."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:26
 #, fuzzy
-msgid "FS option"
-msgstr "Ð\94обавиÑ\82Ñ\8c паÑ\80амеÑ\82Ñ\80"
+msgid "please choose a release..."
+msgstr "Ð\9fожалÑ\83йÑ\81Ñ\82а, Ñ\83кажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\83Ñ\8e кадÑ\80овÑ\83Ñ\8e Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\8e."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/faiPackageNew.tpl:37
 #, fuzzy
-msgid "Preserve"
-msgstr "серверы"
+msgid "Sections for this release"
+msgstr "Местоположение ветки"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
-#, php-format
-msgid "please enter a unique mount point for partition %s"
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
-#, fuzzy, php-format
-msgid "Please enter a valid mount point for partition %s."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй пÑ\83Ñ\82Ñ\8c в поле \"Ð\94омаÑ\88ний каÑ\82алог\"."
+#: plugins/admin/fai/faiNewBranch.tpl:11
+#, fuzzy
+msgid "Please enter a name for the branch"
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она!"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
-#, php-format
+#: plugins/admin/fai/faiNewBranch.tpl:34
 msgid ""
-"File system type 'swap' is already used, change file system type for "
-"partition %s."
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
-msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
-#, fuzzy, php-format
-msgid "Please enter a valid partition size for partition %s."
-msgstr "Введите корректный путь в поле \"Домашний каталог\"."
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
-#, fuzzy, php-format
-msgid "Please enter a valid range for partition %s."
-msgstr "Введите корректный серийный номер"
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
-#, fuzzy, php-format
-msgid "Please enter a range for partition size for partition %s."
-msgstr "Введите корректный серийный номер"
+#: plugins/admin/fai/faiNewBranch.tpl:42
+#, fuzzy
+msgid "Initiate operation"
+msgstr "Создать параметры"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
+#: plugins/admin/fai/remove_branch.tpl:6
+#, fuzzy
 msgid ""
-"You have more than 3 primary partition table entries in your configuration, "
-"please check your configuration twice."
+"This includes all account data, system access, etc. for this branch. 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/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/class_faiSummaryTab.inc:39
 #, fuzzy
-msgid "Device"
-msgstr "УÑ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
+msgid "Scripts"
+msgstr "Ð\9fÑ\83Ñ\82Ñ\8c к Ñ\81Ñ\86енаÑ\80иÑ\8fм"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-#, fuzzy
-msgid "Partition entries"
-msgstr "Переменная"
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
+msgid "Package list"
+msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-#, fuzzy
-msgid "Add partition"
-msgstr "Добавить параметр"
+#: plugins/admin/fai/class_faiSummaryTab.inc:184
+msgid "This object has no FAI classes assigned."
+msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/class_faiSummaryTab.inc:196
 #, fuzzy
-msgid "List of scripts"
-msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
+msgid "Open"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b"
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:98
+#: plugins/admin/fai/class_faiSummaryTab.inc:303
 #, fuzzy
-msgid "Please specify a value for the attribute 'content'."
-msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+msgid "No."
+msgstr "неÑ\82"
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
+#: plugins/admin/fai/class_faiSummaryTab.inc:305
 #, fuzzy
-msgid "Variable attributes"
-msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
+msgid "FS options"
+msgstr "Ð\94обавиÑ\82Ñ\8c паÑ\80амеÑ\82Ñ\80"
 
-#: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/branch_selector.tpl:21
 #, fuzzy
-msgid "Variable content"
-msgstr "Ð\9fеÑ\80еменнаÑ\8f"
+msgid "Create new branch"
+msgstr "Создание нового обÑ\8aекÑ\82а в"
 
-#: plugins/admin/fai/faiTemplate.tpl:31
+#: plugins/admin/fai/branch_selector.tpl:25
 #, fuzzy
-msgid "List of template files"
-msgstr "СпиÑ\81ок подÑ\80азделений"
+msgid "Create new locked branch"
+msgstr "Создание нового обÑ\8aекÑ\82а в"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
+#: plugins/admin/fai/branch_selector.tpl:30
 #, fuzzy
-msgid "Choose a template to delete or edit"
-msgstr "Ð\92Ñ\8bбÑ\80аÑ\82Ñ\8c Ñ\80аздел, длÑ\8f Ñ\85Ñ\80анениÑ\8f обÑ\8aекÑ\82а"
+msgid "Delete current release"
+msgstr "УдалиÑ\82Ñ\8c"
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/class_divListFai.inc:43
 #, fuzzy
-msgid "List of hook scripts"
-msgstr "СÑ\82оп-лиÑ\81Ñ\82Ñ\8b"
+msgid "List of FAI classes"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:269
-#: plugins/admin/fai/class_faiPartitionTable.inc:275
-#, fuzzy, php-format
-msgid "%s partition"
-msgstr "Показать рабочие станции"
+#: plugins/admin/fai/class_divListFai.inc:44
+#, fuzzy
+msgid "This table displays all FAI classes, in the selected tree."
+msgstr "Приложение с таким именем уже существует."
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:271
-#: plugins/admin/fai/class_faiPartitionTable.inc:277
-#, fuzzy, php-format
-msgid "%s partition(s)"
-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_faiHookEntry.inc:143
+#: plugins/admin/fai/class_divListFai.inc:64
 #, fuzzy
-msgid "Please enter a value for script."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
+msgid "Name of FAI class"
+msgstr "Ð\98мÑ\8f Ñ\81Ñ\82оп-лиÑ\81Ñ\82а"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:123
-msgid "Package bundle"
+#: plugins/admin/fai/class_divListFai.inc:65
+msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:154
-#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Display FAI profile objects"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:68
 #, fuzzy
-msgid "Class name"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
+msgid "Show profiles"
+msgstr "Ð\9fоказаÑ\82Ñ\8c пÑ\80инÑ\82еÑ\80Ñ\8b"
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+#: plugins/admin/fai/class_divListFai.inc:69
 #, fuzzy
-msgid "Hook attributes"
-msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
+msgid "Display FAI template objects"
+msgstr "СпиÑ\81ок подÑ\80азделений"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr ""
+#: plugins/admin/fai/class_divListFai.inc:70
+#, fuzzy
+msgid "Display FAI scripts"
+msgstr "Список пользователей"
 
-#: plugins/admin/fai/faiHookEntry.tpl:36
-msgid "Choose an existing FAI task"
-msgstr ""
+#: plugins/admin/fai/class_divListFai.inc:70
+#, fuzzy
+msgid "Show scripts"
+msgstr "Показать хосты"
 
-#: plugins/admin/fai/class_askClassName.inc:81
+#: plugins/admin/fai/class_divListFai.inc:71
 #, fuzzy
-msgid "Create new FAI object - partition table."
-msgstr "Объект группы"
+msgid "Display FAI hooks"
+msgstr "Ошибка LDAP:"
 
-#: plugins/admin/fai/class_askClassName.inc:82
+#: plugins/admin/fai/class_divListFai.inc:71
 #, fuzzy
-msgid "Create new FAI object - package bundle."
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппы"
+msgid "Show hooks"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\85оÑ\81Ñ\82ы"
 
-#: plugins/admin/fai/class_askClassName.inc:83
+#: plugins/admin/fai/class_divListFai.inc:72
 #, fuzzy
-msgid "Create new FAI object - script bundle."
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
+msgid "Display FAI variables"
+msgstr "УÑ\81Ñ\82Ñ\80ойÑ\81Ñ\82во оÑ\82обÑ\80ажениÑ\8f"
 
-#: plugins/admin/fai/class_askClassName.inc:84
+#: plugins/admin/fai/class_divListFai.inc:72
 #, fuzzy
-msgid "Create new FAI object - variable bundle."
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппы"
+msgid "Show variables"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82еÑ\80миналы"
 
-#: plugins/admin/fai/class_askClassName.inc:85
+#: plugins/admin/fai/class_divListFai.inc:73
 #, fuzzy
-msgid "Create new FAI object - hook bundle."
-msgstr "Объект группы"
+msgid "Display FAI packages"
+msgstr "Отображаемое имя"
 
-#: plugins/admin/fai/class_askClassName.inc:86
+#: plugins/admin/fai/class_divListFai.inc:73
 #, fuzzy
-msgid "Create new FAI object - profile."
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппы"
+msgid "Show packages"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82елеÑ\84оны"
 
-#: plugins/admin/fai/class_askClassName.inc:87
+#: plugins/admin/fai/class_divListFai.inc:74
 #, fuzzy
-msgid "Create new FAI object - template."
-msgstr "СоздаÑ\82Ñ\8c Ñ\88аблон"
+msgid "Display FAI partitions"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\80абоÑ\87ие Ñ\81Ñ\82анÑ\86ии"
 
-#: plugins/admin/fai/class_askClassName.inc:88
+#: plugins/admin/fai/class_divListFai.inc:74
 #, fuzzy
-msgid "Create new FAI object"
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
+msgid "Show partitions"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\80абоÑ\87ие Ñ\81Ñ\82анÑ\86ии"
 
-#: plugins/admin/fai/class_askClassName.inc:142
+#: plugins/admin/fai/class_divListFai.inc:131
 #, fuzzy
-msgid "The given class name is empty."
-msgstr "Ð\97наÑ\87ение полÑ\8f \"ФайлÑ\8b\" некоÑ\80Ñ\80екÑ\82но."
+msgid "New profile"
+msgstr "УпÑ\80авление Ñ\81иÑ\81Ñ\82емами"
 
-#: plugins/admin/fai/class_askClassName.inc:146
+#: plugins/admin/fai/class_divListFai.inc:136
 #, fuzzy
-msgid "The specified class name is already in use for this object type."
-msgstr "Ð\93Ñ\80Ñ\83ппа Ñ\81 Ñ\82аким именем Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
+msgid "New partition table"
+msgstr "Ð\9fÑ\80инÑ\82еÑ\80"
 
-#: plugins/admin/fai/askClassName.tpl:6
-msgid ""
-"Adding a new class to the FAI management, requires a class name. You have to "
-"specify a unique class name for unique types of FAI classes, while you can "
-"use the same class name for different types of FAI classes. In the laste "
-"case, FAI will automatically enclose all these different class types to one "
-"unique class name."
+#: plugins/admin/fai/class_divListFai.inc:136
+msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/askClassName.tpl:12
-msgid ""
-"Please use one of the following methods to choose the name for the new FAI "
-"class."
-msgstr ""
+#: plugins/admin/fai/class_divListFai.inc:139
+#, fuzzy
+msgid "New scripts"
+msgstr "Показать хосты"
 
-#: plugins/admin/fai/askClassName.tpl:26
-msgid "Enter FAI class name manually"
+#: plugins/admin/fai/class_divListFai.inc:139
+msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/askClassName.tpl:48
-msgid "Choose FAI class name from a list of existing classes"
+#: plugins/admin/fai/class_divListFai.inc:142
+#, fuzzy
+msgid "New hooks"
+msgstr "Показать хосты"
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/askClassName.tpl:54
+#: plugins/admin/fai/class_divListFai.inc:145
 #, fuzzy
-msgid "Choose class name"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
+msgid "New variables"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82еÑ\80миналÑ\8b"
 
-#: plugins/admin/fai/askClassName.tpl:74
-#, fuzzy
-msgid "A new class name."
-msgstr "Доступные приложения"
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "V"
+msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:88
+#: plugins/admin/fai/class_divListFai.inc:148
 #, fuzzy
-msgid "no file uploaded yet"
-msgstr "Файл небÑ\8bл загÑ\80Ñ\83жен"
+msgid "New templates"
+msgstr "СоздаÑ\82Ñ\8c Ñ\88аблон"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:93
-#, php-format
-msgid "exists in database (size: %s bytes)"
+#: plugins/admin/fai/class_divListFai.inc:148
+msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:184
+#: plugins/admin/fai/class_divListFai.inc:151
 #, fuzzy
-msgid "Please specify a value for attribute 'file'."
-msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
+msgid "New package list"
+msgstr "ЧиÑ\81ло Ñ\81Ñ\82Ñ\80аниÑ\86"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:188
-#, fuzzy
-msgid "Please specify a value for attribute 'path'."
-msgstr "Укажите корректный номер телефона."
+#: plugins/admin/fai/class_divListFai.inc:151
+msgid "PK"
+msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:196
+#: plugins/admin/fai/class_divListFai.inc:222
+#: plugins/admin/fai/class_divListFai.inc:227
 #, fuzzy
-msgid "Please enter a user."
-msgstr "Ð\92ведиÑ\82е адÑ\80еÑ\81 Ñ\81еÑ\80веÑ\80а"
+msgid "Edit class"
+msgstr "СпиÑ\81ок Ñ\81иÑ\81Ñ\82ем"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:199
+#: plugins/admin/fai/class_divListFai.inc:230
 #, fuzzy
-msgid "Please enter a valid user. Only a-z/0-9 are allowed."
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f!"
+msgid "Delete class"
+msgstr "УдалиÑ\82Ñ\8c"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:203
+#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/paste_generic.tpl:13
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:148
 #, fuzzy
-msgid "Please enter a group."
-msgstr "Ð\92ведиÑ\82е адÑ\80еÑ\81 Ñ\81еÑ\80веÑ\80а"
+msgid "Mime type"
+msgstr "Тип"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:206
+#: plugins/admin/mimetypes/generic.tpl:16
+#: plugins/admin/mimetypes/paste_generic.tpl:16
 #, fuzzy
-msgid "Please enter a valid group. Only a-z/0-9 are allowed."
-msgstr "Введите корректное имя пользователя!"
+msgid "Please enter a name for the mime type here"
+msgstr "Введите корректный номер телефона!"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:21
+#: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 #, fuzzy
-msgid "Template attributes"
-msgstr "Ð\90Ñ\82Ñ\80ибÑ\83Ñ\82 DN полÑ\8cзоваÑ\82елей"
+msgid "Mime group"
+msgstr "Ð\9eÑ\81новнаÑ\8f гÑ\80Ñ\83ппа"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:35
+#: plugins/admin/mimetypes/generic.tpl:24
 #, fuzzy
-msgid "Save template"
-msgstr "СоздаÑ\82Ñ\8c Ñ\88аблон"
+msgid "Categorize this mime type"
+msgstr "Ð\9aаÑ\82егоÑ\80иÑ\8f Ñ\8dÑ\82ой веÑ\82ки"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:47
+#: plugins/admin/mimetypes/generic.tpl:34
 #, fuzzy
-msgid "Destination path"
-msgstr "Ð\9dазнаÑ\87ение"
+msgid "Please specify a description"
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f!"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
-msgid "Owner"
+#: plugins/admin/mimetypes/generic.tpl:66
+msgid "Update mime type icon"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:80
-#, fuzzy
-msgid "Access"
-msgstr "Адрес"
+#: plugins/admin/mimetypes/generic.tpl:79
+msgid "Left click"
+msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:87
+#: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
-msgid "Read"
-msgstr "чтение"
+msgid "File patterns"
+msgstr "Фильтры"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:88
+#: plugins/admin/mimetypes/generic.tpl:86
 #, fuzzy
-msgid "Write"
-msgstr "запиÑ\81Ñ\8c"
+msgid "Please specify a new file pattern"
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82ное имÑ\8f полÑ\8cзоваÑ\82елÑ\8f!"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:91
-#, fuzzy
-msgid "Special"
-msgstr "терминалы"
+#: plugins/admin/mimetypes/generic.tpl:87
+msgid "Add a new file pattern"
+msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:100
+#: plugins/admin/mimetypes/generic.tpl:92
+#: plugins/admin/mimetypes/generic.tpl:133
 #, fuzzy
-msgid "SUID"
-msgstr "UID"
+msgid "Enter an application name here"
+msgstr "Приложение"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:109
+#: plugins/admin/mimetypes/generic.tpl:93
+#: plugins/admin/mimetypes/generic.tpl:134
 #, fuzzy
-msgid "SGID"
-msgstr "GID"
+msgid "Add application"
+msgstr "приложения"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:112
-#, fuzzy
-msgid "Others"
-msgstr "Фильтры"
+#: plugins/admin/mimetypes/generic.tpl:103
+msgid "Embedding"
+msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:118
-#, fuzzy
-msgid "sticky"
-msgstr "Состояние"
+#: plugins/admin/mimetypes/generic.tpl:114
+msgid "Show file in embedded viewer"
+msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-#, fuzzy
-msgid "Please enter your search string here"
-msgstr "Введите корректный серийный номер"
+#: plugins/admin/mimetypes/generic.tpl:119
+msgid "Show file in external viewer"
+msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
+#: plugins/admin/mimetypes/generic.tpl:124
+msgid "Ask whether to save to local disk"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:434
 #, 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."
+msgid "Saving of mime type/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageEntry.tpl:6
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#, fuzzy, php-format
+msgid "Removing of mime type/generic with dn '%s' failed."
+msgstr "Показать подразделения"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:455
+#, fuzzy, php-format
+msgid "Removing mime type from objectgroup '%s' failed"
+msgstr "Показать группы приложений"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:465
 #, fuzzy
-msgid "List of available packages"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
+msgid "Please specify a valid name for this mime type."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
-#: plugins/admin/fai/faiPackageEntry.tpl:26
-msgid ""
-"This menu allows you to select multiple packages to add them to the "
-"currently edited package list."
-msgstr ""
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:468
+#, fuzzy
+msgid "Please specify at least one file pattern."
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:481
 #, fuzzy
-msgid "Package"
-msgstr "Показать телефоны"
+msgid "There's already a mime type with this 'Name'."
+msgstr "Приложение с таким именем уже существует."
 
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
-#, php-format
-msgid "Debconf information for package '%s'"
-msgstr ""
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:489
+#, fuzzy
+msgid "There's already an mime with this 'Name'."
+msgstr "Приложение с таким именем уже существует."
 
-#: plugins/admin/fai/faiPackageNew.tpl:1
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:501
 #, fuzzy
-msgid "Repository settings"
-msgstr "СеÑ\82евÑ\8bе наÑ\81Ñ\82Ñ\80ойки"
+msgid "You have no permissions to create a mime type on this 'Base'."
+msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f пÑ\80инÑ\82еÑ\80а в Ñ\8dÑ\82ой веÑ\82ке."
 
-#: plugins/admin/fai/faiPackageNew.tpl:3
-msgid ""
-"To add packages to your package list you have to setup the repository "
-"settings first."
-msgstr ""
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "Тип"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
+#, fuzzy
+msgid "Mime types"
+msgstr "Тип"
 
-#: plugins/admin/fai/faiPackageNew.tpl:5
-msgid ""
-"Packages are usually stored on different servers called mirrors. These "
-"mirrors have different types of releases (for example woody/sarge/etch), "
-"which finally contain packages sorted by section."
-msgstr ""
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Создать приложения"
 
-#: plugins/admin/fai/faiPackageNew.tpl:8
-msgid ""
-"Section and release can't be changed in future dialogs, but the mirror can "
-"be changed by editing the entry."
-msgstr ""
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Используемые приложения"
 
-#: plugins/admin/fai/faiPackageNew.tpl:14
-msgid ""
-"First select the preferred release, then the section and finally the mirror."
-msgstr ""
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
+#, fuzzy
+msgid "Manage mime types"
+msgstr "Системы"
 
-#: plugins/admin/fai/faiPackageNew.tpl:21
-msgid "Following releases are available"
-msgstr ""
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#, fuzzy, php-format
+msgid "You're about to delete the mime type '%s'."
+msgstr "Вы собираетесь удалить объект %s."
 
-#: plugins/admin/fai/faiPackageNew.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:290
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:319
 #, fuzzy
-msgid "Sections for this release"
-msgstr "Ð\9cеÑ\81Ñ\82оположение веÑ\82ки"
+msgid "You are not allowed to delete this mime type!"
+msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\83далениÑ\8f Ñ\8dÑ\82ого обÑ\8aекÑ\82а!"
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
+#: plugins/admin/mimetypes/paste_generic.tpl:24
+#, fuzzy
+msgid "Please specify a description for this mime type here"
+msgstr "Укажите корректный номер телефона."
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:35
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:36
 #, fuzzy
-msgid "Please enter a name for the branch"
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она!"
+msgid "List of defined mime types"
+msgstr "Ð\93оÑ\82овÑ\8bе \"Ñ\87еÑ\80нÑ\8bе Ñ\81пиÑ\81ки\""
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:37
+#, fuzzy
 msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management "
-"dialog."
+"This menu allows you to add, edit and remove selected mime types. You may "
+"want to use the range selector on top of the mime type listbox, when working "
+"with a large number of mime types."
 msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"группы пользователей. Если у вас их достаточно большое количество, вы можете "
+"использовать групповое выделение."
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid "Perform requested operation."
-msgstr ""
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
+#, fuzzy
+msgid "Mime type name"
+msgstr "Тип"
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:62
 #, fuzzy
-msgid "Initiate operation"
-msgstr "СоздаÑ\82Ñ\8c паÑ\80амеÑ\82Ñ\80Ñ\8b"
+msgid "Display mime types matching"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81овпадениÑ\8f номеÑ\80ов"
 
-#: plugins/admin/fai/remove_branch.tpl:6
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:118
 #, fuzzy
-msgid ""
-"This includes all account data, system access, etc. for this branch. 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 не сможет отменить результаты этой "
-"операции."
+msgid "Create new mime type"
+msgstr "Создать шаблон"
+
+#: plugins/admin/mimetypes/main.inc:42 plugins/admin/mimetypes/main.inc:44
+#, fuzzy
+msgid "Mimetype management"
+msgstr "Управление системами"
 
 #: plugins/gofon/phoneaccount/generic.tpl:33
 #: plugins/gofon/phoneaccount/paste_generic.tpl:32
@@ -10890,7 +14765,7 @@ msgstr "не определена"
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:646
 #: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:225
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:250
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -10997,32 +14872,71 @@ msgstr "Необходимо указать не менее одного тел
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-msgid "Stop"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:964
+#, fuzzy, php-format
+msgid "Saving of user/phone account with dn '%s' failed."
+msgstr "Аккаунт Proxy"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1083
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1085
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1116
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1118
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1125
+#, fuzzy, php-format
+msgid "Removing of user/phone account with dn '%s' failed."
+msgstr "Удалить учетную запись POSIX"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Настройки телефона"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Способ доставки"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Телефон"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voicemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Телефонные номера"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Почтовые настройки пользователя"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "Настройки телефона"
 
 #: plugins/gofon/macro/headpage.tpl:6
+#: plugins/gofon/macro/class_divListMacros.inc:31
+#: plugins/gofon/macro/class_divListMacros.inc:32
 #, fuzzy
 msgid "List of macros"
 msgstr "Список групп"
 
 #: 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 "
@@ -11044,6 +14958,7 @@ msgid "Display macros  matching"
 msgstr "Шаблон для групп"
 
 #: plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/macro/class_divListMacros.inc:60
 #, fuzzy
 msgid "Regular expression for matching macro names"
 msgstr "Регулярное выражение, соответствующее именам групп"
@@ -11062,12 +14977,12 @@ msgstr ""
 msgid "Choose subtree to place macro in"
 msgstr "Выберите ветку для группы"
 
-#: plugins/gofon/macro/generic.tpl:43
+#: plugins/gofon/macro/generic.tpl:48
 #, fuzzy
 msgid "Visible for user"
 msgstr "Список пользователей"
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/gofon/macro/generic.tpl:57
 #, fuzzy
 msgid "Macro text"
 msgstr "Название"
@@ -11077,112 +14992,109 @@ msgstr "Название"
 msgid "Phone macros"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:253
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
 #, fuzzy, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:259
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:284
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
 #, fuzzy
 msgid "You are not allowed to delete this macro!"
 msgstr "У вас недостаточно прав для удаления этой группы!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
-#, fuzzy
-msgid "Create new phone macro"
-msgstr "Создать телефонный аккаунт"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:349
-#, fuzzy
-msgid "Visible"
-msgstr "Переменная"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:353
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:384
-#, fuzzy
-msgid "Macro"
-msgstr "Название"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:385
-#, fuzzy
-msgid "visible"
-msgstr "Видимый всем"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:386
-#, fuzzy
-msgid "invisible"
-msgstr "Видимый всем"
-
 #: plugins/gofon/macro/class_gofonMacro.inc:103
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:197
 #, fuzzy
 msgid "This 'dn' is no phone macro."
 msgstr "Этот DN не имеет свойств телефона."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:159
+#: plugins/gofon/macro/class_gofonMacro.inc:187
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:191
+#: plugins/gofon/macro/class_gofonMacro.inc:194
+#: plugins/gofon/macro/class_gofonMacro.inc:209
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+#, fuzzy, php-format
+msgid "Removing of goFonMacro/generic account with dn '%s' failed."
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:222
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:261
+#: plugins/gofon/macro/class_gofonMacro.inc:292
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:279
+#: plugins/gofon/macro/class_gofonMacro.inc:310
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:288
-#: plugins/gofon/macro/class_gofonMacro.inc:296
+#: plugins/gofon/macro/class_gofonMacro.inc:319
+#: plugins/gofon/macro/class_gofonMacro.inc:327
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:310
+#: plugins/gofon/macro/class_gofonMacro.inc:341
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:358
+#: plugins/gofon/macro/class_gofonMacro.inc:389
 #, fuzzy, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Подразделение с таким именем уже существует."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:363
+#: plugins/gofon/macro/class_gofonMacro.inc:394
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:367
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:372
+#: plugins/gofon/macro/class_gofonMacro.inc:403
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:378
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:383
+#: plugins/gofon/macro/class_gofonMacro.inc:414
 #, fuzzy
 msgid "Please choose a valid  base."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
+#: plugins/gofon/macro/class_gofonMacro.inc:457
+#, fuzzy, php-format
+msgid "Saving of goFonMacro/generic account with dn '%s' failed."
+msgstr "Создать настройки запись эл. почты"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Управление системами"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "Название"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
 msgid "Argument"
@@ -11228,17 +15140,62 @@ msgid ""
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Управление системами"
 
+#: plugins/gofon/macro/class_divListMacros.inc:52
+#, fuzzy
+msgid "macro name"
+msgstr "Название"
+
+#: plugins/gofon/macro/class_divListMacros.inc:53
+#, fuzzy
+msgid "Visible"
+msgstr "Переменная"
+
+#: plugins/gofon/macro/class_divListMacros.inc:90
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:129
+#, fuzzy
+msgid "Edit macro"
+msgstr "Пользователи домена"
+
+#: plugins/gofon/macro/class_divListMacros.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:132
+#, fuzzy
+msgid "Delete macro"
+msgstr "Удалить"
+
+#: plugins/gofon/macro/class_divListMacros.inc:115
+#, fuzzy
+msgid "Macro"
+msgstr "Название"
+
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#, fuzzy
+msgid "visible"
+msgstr "Видимый всем"
+
+#: plugins/gofon/macro/class_divListMacros.inc:117
+#, fuzzy
+msgid "invisible"
+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. "
@@ -11270,117 +15227,169 @@ msgstr "Имя создаваемой ветки"
 msgid "Choose subtree to place conference in"
 msgstr "Выберите ветку для пользователя"
 
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:66
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:99
+#: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 #, fuzzy
 msgid "Preset PIN"
 msgstr "присутствует"
 
-#: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/class_divListConferences.inc:54
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:113
+#: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 #, fuzzy
 msgid "Record conference"
 msgstr "Ссылки"
 
-#: plugins/gofon/conference/generic.tpl:121
+#: plugins/gofon/conference/generic.tpl:126
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:138
+#: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:144
+#: plugins/gofon/conference/generic.tpl:149
 #, fuzzy
 msgid "Activate session menu"
 msgstr "Включить автоответчик"
 
-#: plugins/gofon/conference/generic.tpl:150
+#: plugins/gofon/conference/generic.tpl:155
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:156
+#: plugins/gofon/conference/generic.tpl:161
 #, fuzzy
 msgid "Count users"
 msgstr "Страна"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 #, fuzzy
 msgid "Phone conferences"
 msgstr "Номер телефона"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-#, fuzzy
-msgid "Management"
-msgstr "Название"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-#, fuzzy
-msgid "Create new conference"
-msgstr "Создание нового объекта в"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-#, fuzzy
-msgid "New conference"
-msgstr "Номер телефона"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
+#, php-format
+msgid "Removing of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-#, fuzzy
-msgid "Name - Number"
-msgstr "Номер телефона"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-#, fuzzy
-msgid "Conference"
-msgstr "Ссылки"
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:191
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:216
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:195
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:220
 #, fuzzy
 msgid "Please enter a PIN."
 msgstr "Введите адрес сервера"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:199
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
 #, fuzzy
 msgid "Please enter a name for the conference."
 msgstr "Введите корректный номер телефона!"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:203
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:228
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:207
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:232
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:347
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:262
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
 msgstr ""
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:510
+#, php-format
+msgid "Saving of goFonConference/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Управление подразделениями"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Ссылки"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Включить автоответчик"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Страна"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Ссылки"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "Порт"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
+#: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 #, fuzzy
 msgid "Conference management"
 msgstr "Управление подразделениями"
 
+#: plugins/gofon/conference/class_divListConferences.inc:52
+#, fuzzy
+msgid "Name - Number"
+msgstr "Номер телефона"
+
+#: plugins/gofon/conference/class_divListConferences.inc:61
+#, fuzzy
+msgid "Regular expression for matching conference names"
+msgstr "Регулярное выражение, соответствующее именам пользователей"
+
+#: plugins/gofon/conference/class_divListConferences.inc:90
+#, fuzzy
+msgid "Create new conference"
+msgstr "Создание нового объекта в"
+
+#: plugins/gofon/conference/class_divListConferences.inc:90
+#, fuzzy
+msgid "New conference"
+msgstr "Номер телефона"
+
+#: plugins/gofon/conference/class_divListConferences.inc:154
+#, fuzzy
+msgid "Conference"
+msgstr "Ссылки"
+
 #: plugins/gofon/fonreports/contents.tpl:31
 msgid "Source"
 msgstr "Источник"
@@ -11397,7 +15406,10 @@ msgstr "Канал"
 msgid "Duration"
 msgstr "Продолжительность"
 
-#: plugins/gofon/fonreports/main.inc:5
+#: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Телефонные отчеты"
 
@@ -11405,19 +15417,19 @@ msgstr "Телефонные отчеты"
 msgid "Phone Reports"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
+#: plugins/gofon/fonreports/class_fonreport.inc:157
+#: plugins/gofon/fonreports/class_fonreport.inc:167
 #, fuzzy
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 "Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:110
+#: plugins/gofon/fonreports/class_fonreport.inc:171
 #, fuzzy
 msgid "Can't select phone database for report generation!"
 msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:212
+#: plugins/gofon/fonreports/class_fonreport.inc:189
 msgid "Query for phone database failed!"
 msgstr "Запрос в базу телефонов не выполнен!"
 
@@ -11441,7 +15453,7 @@ msgstr "Данный объект не имеет ссылок на другие
 #: 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 ""
@@ -11471,7 +15483,7 @@ msgstr "Добро пожаловать %s!"
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:362
+#: include/php_setup.inc:71 html/main.php:381
 #, fuzzy
 msgid "Toggle information"
 msgstr "Личная информация"
@@ -11514,28 +15526,28 @@ msgstr "в"
 msgid "Arguments"
 msgstr "подразделения"
 
-#: include/functions.inc:298
-#, php-format
-msgid "Error when connecting the LDAP. Server said '%s'."
+#: include/functions.inc:299
+#, fuzzy, php-format
+msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:319
+#: include/functions.inc:316
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:338
+#: include/functions.inc:337
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:376
+#: include/functions.inc:468
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr "Ошибка при создании блокировки. Заданные параметры некорректны."
 
-#: include/functions.inc:386
+#: include/functions.inc:478
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -11544,24 +15556,24 @@ msgstr ""
 "Не удается создать блокировку в базе данных LDAP. Проверьте, раздел config в "
 "файле gosa.conf! Ответ сервера: %s"
 
-#: include/functions.inc:401
+#: include/functions.inc:493
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr "Ошибка при создании блокировки. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:427
+#: include/functions.inc:519
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr "Ошибка при удалении блокировки. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:457
+#: include/functions.inc:549
 #, 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:559
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -11569,7 +15581,7 @@ msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
 "\" в файле gosa.conf!"
 
-#: include/functions.inc:475
+#: include/functions.inc:567
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -11577,12 +15589,12 @@ msgstr ""
 "Для блокируемого объекта обнаружено несколько блокировок. Этого быть не "
 "должно, проверьте работу LDAP."
 
-#: include/functions.inc:557
+#: include/functions.inc:655
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:559
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -11591,16 +15603,45 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:576
-msgid "incomplete"
-msgstr "не полный"
+#: include/functions.inc:674
+msgid "incomplete"
+msgstr "не полный"
+
+#: include/functions.inc:1068 include/functions.inc:1258
+msgid "LDAP error:"
+msgstr "Ошибка LDAP:"
+
+#: include/functions.inc:1069
+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:1077
+msgid ""
+"Please check your input and fix the error. Press 'OK' to close this message "
+"box."
+msgstr ""
+
+#: include/functions.inc:1086
+msgid "An error occured while processing your request"
+msgstr ""
+
+#: include/functions.inc:1090 include/functions_setup.inc:254
+msgid "OK"
+msgstr "OK"
+
+#: include/functions.inc:1152
+#, fuzzy
+msgid "Continue anyway"
+msgstr "Продолжить"
 
-#: include/functions.inc:987
-#, php-format
-msgid "Last message repeated %s times."
-msgstr ""
+#: include/functions.inc:1154
+#, fuzzy
+msgid "Edit anyway"
+msgstr "Редактиовать объект"
 
-#: include/functions.inc:1053
+#: include/functions.inc:1156
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -11609,31 +15650,25 @@ msgstr ""
 "Вы собираетесь редактировать запись LDAP \"%s\", которая используется \"%s"
 "\". Пожалуйста, обратитесь к пользователю и уточните отношения."
 
-#: include/functions.inc:1152
-msgid "LDAP error:"
-msgstr "Ошибка LDAP:"
-
-#: include/functions.inc:1330
+#: include/functions.inc:1440
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1358
+#: include/functions.inc:1468
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1632
+#: include/functions.inc:1742
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:1675
+#: include/functions.inc:1785
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
 #: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
+msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
 
 #: include/class_mail-methods-cyrus.inc:52
@@ -11644,73 +15679,87 @@ msgstr ""
 "Предупреждение: не удается получить доступ к серверу IMAP! Некоторые "
 "почтовые настройки не будут сохранены."
 
-#: include/class_mail-methods-cyrus.inc:115
+#: include/class_mail-methods-cyrus.inc:129
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:131
+#: include/class_mail-methods-cyrus.inc:148
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr "Не удается создать квоту IMAP. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:155
+#: include/class_mail-methods-cyrus.inc:174
 #, fuzzy
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 "Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
 "права доступа к общим папкам."
 
-#: include/class_mail-methods-cyrus.inc:173
+#: include/class_mail-methods-cyrus.inc:192
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 "Предупреждение: функция imap_getacl недоступна, не удается считать права на "
 "доступ к папкам!"
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_mail-methods-cyrus.inc:214
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_mail-methods-cyrus.inc:242
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr "Невозможно зарегистрироваться на сервере SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:255
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr "Невозможно получить сценарий SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_mail-methods-cyrus.inc:326
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr "Невозможно отправить сценарий SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_mail-methods-cyrus.inc:330
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:415
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:228
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:448
 #, fuzzy, php-format
 msgid "Creating copy of %s"
 msgstr "Список пользователей"
 
-#: include/class_ldap.inc:418
+#: include/class_ldap.inc:451
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:458
+#: include/class_ldap.inc:491
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:521
+#: include/class_ldap.inc:554
 #, fuzzy, php-format
 msgid "Unknown FAIstate %s"
 msgstr "состояние неизвестно"
 
-#: include/class_ldap.inc:646
+#: include/class_ldap.inc:702
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -11719,56 +15768,140 @@ msgstr ""
 "Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
 "об этом команде разработчиков GOsa."
 
-#: include/class_ldap.inc:908
+#: include/class_ldap.inc:771
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr ""
+
+#: include/class_ldap.inc:773
+#, fuzzy, php-format
+msgid "while operating on LDAP server %s"
+msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
+
+#: include/class_ldap.inc:995
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:921
+#: include/class_ldap.inc:1024
 #, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_ldap.inc:937
+#: include/class_ldap.inc:1152
+#, fuzzy, php-format
+msgid "Ldap import with dn '%s' failed."
+msgstr "Показать подразделения"
+
+#: include/class_tabs.inc:183
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_plugin.inc:389
+#: include/class_tabs.inc:298
+msgid "References"
+msgstr "Ссылки"
+
+#: include/class_plugin.inc:414
 #, 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:529
+#: include/class_plugin.inc:597
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:557 include/class_password-methods.inc:181
+#: include/class_plugin.inc:631 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:585
+#: include/class_plugin.inc:665
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
+#: include/class_plugin.inc:971
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: include/class_plugin.inc:978
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: include/class_plugin.inc:992 include/class_plugin.inc:1021
+#, php-format
+msgid "Handle object tagging with dn '%s' failed."
+msgstr ""
+
+#: include/class_plugin.inc:1008
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr ""
+
+#: include/class_plugin.inc:1069 include/class_plugin.inc:1115
+#: include/class_plugin.inc:1116
+#, fuzzy, php-format
+msgid "Saving object snapshot with dn '%s' failed."
+msgstr "Моя учетная запись"
+
+#: include/class_plugin.inc:1132 include/class_SnapShotDialog.inc:53
+#, fuzzy
+msgid "You are not allowed to delete this snapshot!"
+msgstr "У вас недостаточно прав для удаления этого объекта!"
+
+#: include/class_plugin.inc:1147
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable '%s' is not "
+"configured in your gosa.conf."
+msgstr ""
+
+#: include/class_plugin.inc:1159
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable(s) '%s' is "
+"not configured in your gosa.conf."
+msgstr ""
+
+#: include/class_plugin.inc:1191
+#, php-format
+msgid "Method get available snapshots with dn '%s' failed."
+msgstr ""
+
+#: include/class_plugin.inc:1247
+#, php-format
+msgid "Method get deleted snapshots with dn '%s' failed."
+msgstr ""
+
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1325
+#, fuzzy, php-format
+msgid "Restore snapshot with dn '%s' failed."
+msgstr "Удалить приложения"
+
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_pluglist.inc:115
+#: include/class_pluglist.inc:53
+#, fuzzy
+msgid "All objects in this category"
+msgstr "Описание группы"
+
+#: include/class_pluglist.inc:131
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -11776,9 +15909,14 @@ msgstr ""
 "Ваш конфигурационный файл gosa.conf был частично изменен. Пожалуйста, "
 "сконвертиуйте его используя скрипт fix_config.sh"
 
-#: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
+#: include/class_pluglist.inc:245
+#, fuzzy
+msgid "Unknown"
+msgstr "состояние неизвестно"
+
+#: include/class_pluglist.inc:153 ihtml/themes/default/framework.tpl:14
+#: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -11801,63 +15939,63 @@ msgstr ""
 msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr ""
 
-#: include/class_ppdManager.inc:138
+#: include/class_ppdManager.inc:144
 #, php-format
 msgid "Specified ppd file '%s' can't be opened for reading."
 msgstr ""
 
-#: include/class_ppdManager.inc:140
+#: include/class_ppdManager.inc:146
 #, php-format
 msgid "The required tmp file file '%s' can't be opened for writing."
 msgstr ""
 
-#: include/class_ppdManager.inc:164 include/class_ppdManager.inc:291
+#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: include/class_ppdManager.inc:172
+#: include/class_ppdManager.inc:178
 #, fuzzy
 msgid "Nested groups are not supported!"
 msgstr ""
 "(Предупреждение: NFS не поддерживает более 16 групп для одного пользователя!)"
 
-#: include/class_ppdManager.inc:176
+#: include/class_ppdManager.inc:182
 #, fuzzy
 msgid "Group name not unique!"
 msgstr "Группа"
 
-#: include/class_ppdManager.inc:182 include/class_ppdManager.inc:212
+#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:206
+#: include/class_ppdManager.inc:212
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:231
+#: include/class_ppdManager.inc:237
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:312
+#: include/class_ppdManager.inc:318
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_config.inc:69
+#: include/class_config.inc:71
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Ошибка XML в gosa.conf: %s в строке %d"
 
-#: include/class_config.inc:195 html/index.php:146
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: include/class_config.inc:453
+#: include/class_config.inc:472
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
 
@@ -11906,15 +16044,11 @@ msgstr "Невозможно импортиовать пустой файл"
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_setup.inc:98
-msgid "Can't bind to LDAP. No schema check possible!"
-msgstr "Не удается начать сеанс на LDAP-сервере. Проверка схем невозможна!"
-
-#: include/functions_setup.inc:107 include/functions_setup.inc:116
+#: include/functions_setup.inc:84
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr "Не удается получить информацию о схемах. Проверка схем невозможна!"
 
-#: include/functions_setup.inc:136
+#: include/functions_setup.inc:99
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -11923,7 +16057,7 @@ msgstr ""
 "Необязательный класс объектов \"%s\", нужный для модуля \"%s\", отсутствует "
 "в установке LDAP."
 
-#: include/functions_setup.inc:140
+#: include/functions_setup.inc:103
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -11931,128 +16065,134 @@ msgstr ""
 "У необязательного класса объектов \"%s\", нужного для модуля \"%s\", версия "
 "не %s"
 
-#: include/functions_setup.inc:145
+#: include/functions_setup.inc:108
 #, fuzzy, php-format
 msgid "Support for '%s' enabled"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:155
+#: include/functions_setup.inc:118
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr "Обязательный класс объектов \"%s\" отсутствует в установке LDAP."
 
-#: include/functions_setup.inc:159
+#: include/functions_setup.inc:122
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr "У обязательного класса объектов \"%s\" версия не %s"
 
-#: include/functions_setup.inc:170
+#: include/functions_setup.inc:133
 #, fuzzy
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr "Поддержка Samba 3 отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:175
+#: include/functions_setup.inc:138
 msgid "SAMBA 3 support enabled"
 msgstr ""
 
-#: include/functions_setup.inc:180
+#: include/functions_setup.inc:143
 #, fuzzy
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr "Поддержка Samba 2 отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:185
+#: include/functions_setup.inc:148
 msgid "SAMBA 2 support enabled"
 msgstr ""
 
-#: include/functions_setup.inc:191
+#: include/functions_setup.inc:154
 #, fuzzy
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr "Поддержка PureFTP отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:196
+#: include/functions_setup.inc:159
 msgid "Support for pureftp enabled"
 msgstr ""
 
-#: include/functions_setup.inc:201
+#: include/functions_setup.inc:164
 #, fuzzy
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr "Поддержка WebDAV отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:206
+#: include/functions_setup.inc:169
 msgid "Support for WebDAV enabled"
 msgstr ""
 
-#: include/functions_setup.inc:211
+#: include/functions_setup.inc:174
 #, fuzzy
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:216
+#: include/functions_setup.inc:179
 #, fuzzy
 msgid "Support for phpgroupware enabled"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:221
+#: include/functions_setup.inc:184
 #, fuzzy
 msgid "Support for trustAccount disabled, no schema seems to be installed"
 msgstr "Поддержка Gofon отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:226
+#: include/functions_setup.inc:189
 #, fuzzy
 msgid "Support for trustAccount enabled"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:231
+#: include/functions_setup.inc:194
 #, fuzzy
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr "Поддержка Gofon отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:236
+#: include/functions_setup.inc:199
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:204
 #, fuzzy
 msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr "Поддержка Gofon отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:246
+#: include/functions_setup.inc:209
 #, fuzzy
 msgid "Support for nagios enabled"
 msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:256
+#: include/functions_setup.inc:214
+#, fuzzy
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr "Поддержка Gofon отключена, не все схемы установлены!"
+
+#: include/functions_setup.inc:219
+#, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Поддержка phpgroupware отключена, не все схемы установлены!"
+
+#: include/functions_setup.inc:229
 #, fuzzy
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr "Поддержка Gofon отключена, не все схемы установлены!"
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:236
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:281
-msgid "OK"
-msgstr "OK"
-
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:257
 msgid "Ignored"
 msgstr "Пропуск"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:259
 msgid "Failed"
 msgstr "Ошибка"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:276
 msgid "PHP setup inspection"
 msgstr "Проверка конфигурации PHP"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:278
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Проверка версии PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:279
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -12060,11 +16200,11 @@ msgstr ""
 "У вас должна быть установка PHP версии не ниже 4.1.0, так как в ней "
 "реализованы некоторые новые функции и исправлены некоторые ошибки."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:282
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Проверка значения параметра register_globals (должно быть: off)"
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:283
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -12074,47 +16214,58 @@ msgstr ""
 "переменные доступными из сценария без смены области действия. Это может быть "
 "нарушением безопасности. Тем не менее, GOsa будет работать в любом случае."
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:286
+msgid "PHP session.gc_maxlifetime (>= 86400 seconds)."
+msgstr ""
+
+#: include/functions_setup.inc:287
+msgid ""
+"PHP uses this value for the garbage collector to delete old sessions, "
+"setting this value to one day will prevent loosing session and cookie  "
+"before they really timeout."
+msgstr ""
+
+#: include/functions_setup.inc:290
 msgid "Checking for ldap module"
 msgstr "Проверка модуля ldap"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:291
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Основной модуль, используемый GOsa, и поэтому обязательный."
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:294
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:295
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:298
 msgid "Checking for gettext support"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:299
 msgid "Gettext support is required for internationalized GOsa."
 msgstr "Необходима для локализованных версий GOsa."
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:302
 #, fuzzy
 msgid "Checking for iconv support"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:303
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:306
 msgid "Checking for mhash module"
 msgstr "Проверка модуля mhash"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:307
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
@@ -12123,11 +16274,11 @@ msgstr ""
 "используете только алгоритмы crypt или MD5, не обращайте внимания на "
 "результат проверки. GOsa будет работать и без этого модуля."
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:310
 msgid "Checking for imap module"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:311
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -12135,11 +16286,11 @@ msgstr ""
 "Этот модуль нужен для работы с сервером IMAP. С его помощью можно получать "
 "информацию о состоянии учетной записи, создавать и удалять пользователей."
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:314
 msgid "Checking for getacl in imap"
 msgstr "Проверка использования getacl в IMAP"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:315
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
@@ -12149,21 +16300,21 @@ msgstr ""
 "Стандартный модуль IMAP не может обрабатывать acl. Для использования этой "
 "функции вам нужна последняя версия PHP."
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:318
 msgid "Checking for mysql module"
 msgstr "Проверка модуля mysql"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:319
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "Необходим для чтения отчетов о полученных факсимильных сообщениях из базы "
 "данных."
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:322
 msgid "Checking for cups module"
 msgstr "Проверка модуля cups"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:323
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -12171,11 +16322,11 @@ msgstr ""
 "Чтобы получать информацию о доступных принтерах по протоколу IPP вместо "
 "чтения файлов printcap, вам нужно установить модуль CUPS."
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:326
 msgid "Checking for kadm5 module"
 msgstr "Проверка модуля kadm5"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:327
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -12183,42 +16334,42 @@ msgstr ""
 "Чтобы управлять пользователями с помощью Kerberos, необходим модуль kadm5, "
 "который можно загрузить из сети PEAR."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:330
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:331
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:367
 #, fuzzy
 msgid "PHP detailed function inspection"
 msgstr "Проверка конфигурации PHP"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:371
 #, fuzzy, php-format
 msgid "Checking for function %s"
 msgstr "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:372
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
 msgstr ""
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:383
 msgid "Checking for some additional programms"
 msgstr "Проверка дополнительных программ"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:392
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Проверка ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:393
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -12226,12 +16377,12 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:396
 #, fuzzy
 msgid "Checking imagick module for PHP"
 msgstr "Проверка модуля IMAP"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:397
 #, fuzzy
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
@@ -12240,11 +16391,11 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:404
 msgid "Checking for fping utility"
 msgstr "Проверка утилиты fping"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:405
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -12252,11 +16403,11 @@ msgstr ""
 "Эта программа используется, только если вы работате с бездисковыми "
 "терминалами."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:420
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Проверка возможности создания хэшей LM/NT для паролей"
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:421
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -12264,181 +16415,382 @@ msgstr ""
 "Чтобы пользоваться Samba 2/3, вам нужно установить некоторые дополнительные "
 "программы для создания хэшей паролей."
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:434
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:435
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:438
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:439
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:446
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:447
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:454
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:455
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:459
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:460
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:464
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:465
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:732
-msgid "You've to specify an ldap server before continuing!"
-msgstr "Для продолжения укажите LDAP-сервер!"
+#: include/functions_setup.inc:711
+msgid "You've to specify an ldap server before continuing!"
+msgstr "Для продолжения укажите LDAP-сервер!"
+
+#: include/functions_setup.inc:720 include/functions_setup.inc:803
+msgid ""
+"Can't connect to the specified LDAP server! Please make sure that is "
+"reachable for GOsa."
+msgstr ""
+"Не удается подключиться к указанному LDAP-серверу! Убедитесь, что он "
+"доступен GOsa."
+
+#: include/functions_setup.inc:734 include/functions_setup.inc:808
+#: include/functions_setup.inc:813
+#, fuzzy
+msgid ""
+"Can't bind to the specified LDAP server! Please make sure that it is "
+"reachable for GOsa."
+msgstr ""
+"Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
+"доступен GOsa."
+
+#: include/functions_setup.inc:823
+msgid ""
+"Bind to server successful, but the server seems to be completly empty, "
+"please check all information twice"
+msgstr ""
+
+#: include/functions_setup.inc:879
+#, php-format
+msgid ""
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
+msgstr ""
+"Вы не заполнили обязательное поле \"%s\". Пожалуйста, заполните форму "
+"целиком."
+
+#: include/functions_setup.inc:910
+msgid ""
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
+"verify that it is readable for GOsa"
+msgstr ""
+
+#: include/functions_setup.inc:919
+#, php-format
+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:252
+#: 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/functions_helpviewer.inc:43
+#, fuzzy, php-format
+msgid "XML error in guide.xml: %s at line %d"
+msgstr "Ошибка XML в gosa.conf: %s в строке %d"
+
+#: include/functions_helpviewer.inc:84
+msgid "No help available for this plugin."
+msgstr ""
+
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
+msgid "previous"
+msgstr ""
+
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
+#, fuzzy
+msgid "next"
+msgstr "текст"
+
+#: include/functions_helpviewer.inc:385
+#, php-format
+msgid "%s results for your search with the keyword %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:459
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr ""
+
+#: include/class_debconfTemplate.inc:260
+#, fuzzy
+msgid "This package has no debconf options."
+msgstr "В этой учетной записи нет атрибутов для телефона."
+
+#: include/class_MultiSelectWindow.inc:398
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:502
+msgid "Restore snapshopts of already deleted objects"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:503
+#, fuzzy
+msgid "Restore"
+msgstr "Повторить"
+
+#: include/class_MultiSelectWindow.inc:521
+#: include/class_SnapShotDialog.inc:105
+msgid "Restore snapshot"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:527
+#, fuzzy
+msgid "Create snapshot"
+msgstr "Создать настройки запись эл. почты"
+
+#: include/class_MultiSelectWindow.inc:527
+#, fuzzy
+msgid "Create a new snapshot from this object"
+msgstr "Объект группы"
+
+#: include/functions_dns.inc:166
+#, php-format
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+msgstr ""
+
+#: include/functions_dns.inc:171
+#, php-format
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
+msgstr ""
+
+#: include/functions_dns.inc:363
+#, php-format
+msgid ""
+"Found more than one dns zone which contains an entry named '%s'. Aborting "
+"getting dns informations for this device."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:152
+#, fuzzy, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr "Вы собираетесь удалить объект %s."
+
+#: include/class_CopyPasteHandler.inc:216
+#, fuzzy
+msgid "Paste"
+msgstr "Дата"
+
+#: include/class_CopyPasteHandler.inc:218
+#, fuzzy
+msgid "Can't paste"
+msgstr "Создать телефонный аккаунт"
+
+#: include/functions_FAI.inc:362
+#, php-format
+msgid "Error, following objects should be equal '%s' and '%s'"
+msgstr ""
+
+#: include/functions_FAI.inc:468
+#, php-format
+msgid "Release management failed, can't save '%s'"
+msgstr ""
+
+#: include/class_acl.inc:6
+#, fuzzy
+msgid "Access control"
+msgstr "Параметры доступа"
+
+#: include/class_acl.inc:145
+#, fuzzy
+msgid "All categories"
+msgstr "Категория"
+
+#: include/class_acl.inc:153
+msgid "Reset ACLs"
+msgstr ""
+
+#: include/class_acl.inc:154
+#, fuzzy
+msgid "One level"
+msgstr "Уровень информативности"
+
+#: include/class_acl.inc:155 include/class_acl.inc:160
+#, fuzzy
+msgid "Current object"
+msgstr "Текущий пароль"
+
+#: include/class_acl.inc:156
+#, fuzzy
+msgid "Complete subtree"
+msgstr "не полный"
+
+#: include/class_acl.inc:157
+msgid "Complete subtree (permanent)"
+msgstr ""
+
+#: include/class_acl.inc:161
+msgid "Use ACL defined in role"
+msgstr ""
+
+#: include/class_acl.inc:364
+#, fuzzy
+msgid "Edit ACL"
+msgstr "Изменить"
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
-msgid ""
-"Can't connect to the specified LDAP server! Please make sure that is "
-"reachable for GOsa."
-msgstr ""
-"Не удается подключиться к указанному LDAP-серверу! Убедитесь, что он "
-"доступен GOsa."
+#: include/class_acl.inc:365
+#, fuzzy
+msgid "Delete ACL"
+msgstr "Удалить"
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/class_acl.inc:402
 #, fuzzy
-msgid ""
-"Can't bind to the specified LDAP server! Please make sure that it is "
-"reachable for GOsa."
+msgid "No ACL settings for this category"
+msgstr "Описание группы"
+
+#: include/class_acl.inc:404
+#, php-format
+msgid "Contains ACLs for these objects: %s"
 msgstr ""
-"Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
-"доступен GOsa."
 
-#: include/functions_setup.inc:844
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all information twice"
+#: include/class_acl.inc:409
+#, fuzzy
+msgid "Edit categories ACLs"
+msgstr "Список систем"
+
+#: include/class_acl.inc:410
+msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/functions_setup.inc:900
+#: include/class_acl.inc:449
 #, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
+msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
-"Вы не заполнили обязательное поле \"%s\". Пожалуйста, заполните форму "
-"целиком."
 
-#: include/functions_setup.inc:931
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
+#: include/class_acl.inc:459
+msgid "All objects in current subtree"
 msgstr ""
 
-#: include/functions_setup.inc:940
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "Ð\9dевозможно заÑ\80егиÑ\81Ñ\82Ñ\80иÑ\80оваÑ\82Ñ\8cÑ\81Ñ\8f на LDAP-Ñ\81еÑ\80веÑ\80е. Ð\9fÑ\80иÑ\87ина: %s."
+#: include/class_acl.inc:495
+#, fuzzy
+msgid "Create objects"
+msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:186
-#: 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_acl.inc:496
+#, fuzzy
+msgid "Move objects"
+msgstr "Включаемые объекты"
 
-#: include/functions_helpviewer.inc:43
-#, fuzzy, php-format
-msgid "XML error in guide.xml: %s at line %d"
-msgstr "Ð\9eÑ\88ибка XML в gosa.conf: %s в Ñ\81Ñ\82Ñ\80оке %d"
+#: include/class_acl.inc:497
+#, fuzzy
+msgid "Remove objects"
+msgstr "Ð\92клÑ\8eÑ\87аемÑ\8bе обÑ\8aекÑ\82Ñ\8b"
 
-#: include/functions_helpviewer.inc:86
-msgid "No help available for this plugin."
+#: include/class_acl.inc:499 include/class_acl.inc:505
+msgid "Modifyable by owner"
 msgstr ""
 
-#: include/functions_helpviewer.inc:95
-msgid "previous"
-msgstr ""
+#: include/class_acl.inc:502
+#, fuzzy
+msgid "Move object"
+msgstr "Включаемые объекты"
 
-#: include/functions_helpviewer.inc:99
+#: include/class_acl.inc:503
 #, fuzzy
-msgid "next"
-msgstr "текст"
+msgid "Remove object"
+msgstr "Включаемые объекты"
 
-#: include/functions_helpviewer.inc:387
+#: include/class_acl.inc:602
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/functions_helpviewer.inc:462
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr ""
+#: include/class_acl.inc:642
+#, fuzzy, php-format
+msgid "Unknown entry '%s'!"
+msgstr "состояние неизвестно"
 
-#: include/class_debconfTemplate.inc:260
+#: include/class_acl.inc:703
+#, fuzzy, php-format
+msgid "Contains settings for these objects: %s"
+msgstr "Описание группы"
+
+#: include/class_acl.inc:711
 #, fuzzy
-msgid "This package has no debconf options."
-msgstr "В этой учетной записи нет атрибутов для телефона."
+msgid "Members:"
+msgstr "Включаемые объекты"
 
-#: include/functions_dns.inc:166
-#, php-format
-msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+#: include/class_acl.inc:717
+msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/functions_dns.inc:171
-#, php-format
-msgid ""
-"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
-"zone."
-msgstr ""
+#: include/class_acl.inc:825
+#, fuzzy, php-format
+msgid "Saving ACLs with dn '%s' failed."
+msgstr "Атрибуты UNIX"
 
-#: include/functions_dns.inc:363
-#, php-format
-msgid ""
-"Found more than one dns zone which contains an entry named '%s'. Aborting "
-"getting dns informations for this device."
+#: include/class_SnapShotDialog.inc:47
+#, fuzzy, php-format
+msgid "You're about to delete the snapshot '%s'."
+msgstr "Вы собираетесь удалить группу \"%s\"."
+
+#: include/class_SnapShotDialog.inc:107
+#, fuzzy
+msgid "Remove snapshot"
+msgstr "Создать настройки запись эл. почты"
+
+#: include/class_SnapShotDialog.inc:109 include/class_SnapShotDialog.inc:129
+msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:176
-#, fuzzy, php-format
-msgid "You are going to copy the entry '%s'."
-msgstr "Ð\92Ñ\8b Ñ\81обиÑ\80аеÑ\82еÑ\81Ñ\8c Ñ\83далиÑ\82Ñ\8c обÑ\8aекÑ\82 %s."
+#: include/class_SnapShotDialog.inc:141
+#, fuzzy
+msgid "Please specify a valid description for this snapshot."
+msgstr "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй номеÑ\80 Ñ\82елеÑ\84она."
 
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
@@ -12446,12 +16798,16 @@ msgstr ""
 "Ошибка: для экспорта в формат vcard файлу getcvard.php нужно передать "
 "параметр!"
 
-#: html/helpviewer.php:116
+#: html/helpviewer.php:67
+msgid "Help browser"
+msgstr ""
+
+#: html/helpviewer.php:118
 #, fuzzy
-msgid "There is no helpfile specified for this class."
+msgid "There is no helpfile specified for this class"
 msgstr "Метод '%s' не описан в вашем файле конфигурации."
 
-#: html/helpviewer.php:226
+#: html/helpviewer.php:265
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
@@ -12475,24 +16831,30 @@ msgid ""
 "please check existence and rights of this directory!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/main.php:151
+#: html/main.php:165
+#, fuzzy
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"FATAL: Register globals is on. GOsa will refuse to login unless this is "
+"fixed by an administrator."
 msgstr ""
 "Используется механизм register_globals. GOsa не допустит пользователей в "
 "систему, пока он не будет отключен администратором."
 
-#: html/main.php:194
+#: html/main.php:207
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr "Предупреждение: нехватка памяти, увеличьте значение memory_limit!"
 
-#: html/main.php:334
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
+#: html/main.php:342
+#, fuzzy, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr "Не удается найти определение для модуля \"%s\"!"
 
-#: html/main.php:362
+#: html/main.php:357
+#, fuzzy
+msgid "Your password is about to expire, please change your password"
+msgstr "У вас недостаточно прав для смены своего пароля."
+
+#: html/main.php:381
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -12508,49 +16870,56 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr "Удалить"
 
-#: html/index.php:54
+#: html/index.php:49 html/index.php:339
+msgid "Session will not be encrypted."
+msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
+
+#: html/index.php:49 html/index.php:339
+msgid "Enter SSL session"
+msgstr "Использовать шифрование SSL"
+
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 "Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
 
-#: html/index.php:76
+#: html/index.php:142
 #, fuzzy, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/index.php:159
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:167
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:194
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Введите корректное имя пользователя!"
 
-#: html/index.php:196
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Введите свой пароль!"
 
-#: html/index.php:203
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:242 html/index.php:306
-msgid "Session will not be encrypted."
-msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
-
-#: html/index.php:242 html/index.php:306
-msgid "Enter SSL session"
-msgstr "Использовать шифрование SSL"
+#: html/index.php:293
+#, fuzzy
+msgid "Account locked. Please contact your system administrator."
+msgstr ""
+"Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
+"администратору."
 
-#: html/index.php:248
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -12571,7 +16940,7 @@ msgstr "Имя сервера"
 msgid "User list of %s on %s"
 msgstr "Список пользователей"
 
-#: html/getxls.php:94 html/getxls.php:227
+#: html/getxls.php:94 html/getxls.php:227 ihtml/themes/default/acl.tpl:41
 #, fuzzy
 msgid "Members"
 msgstr "Включаемые объекты"
@@ -12592,25 +16961,21 @@ msgstr "не полный"
 msgid "Common name"
 msgstr "Местоположение"
 
+#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
+#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "Серверы"
+
 #: html/getxls.php:156 html/getxls.php:314
 #, fuzzy, php-format
 msgid "Servers of %s on %s"
 msgstr "Серверы"
 
-#: html/getxls.php:174
-msgid "Home postal address"
-msgstr ""
-
 #: html/getxls.php:174
 #, fuzzy
 msgid "Mobile phone"
 msgstr "Домашний телефон"
 
-#: html/getxls.php:174 html/getxls.php:236
-#, fuzzy
-msgid "Postal address"
-msgstr "Почтовый индекс"
-
 #: html/getxls.php:174
 #, fuzzy
 msgid "Function"
@@ -12651,11 +17016,6 @@ msgstr "Организация"
 msgid "Postal Code"
 msgstr "Почтовый индекс"
 
-#: html/getxls.php:236
-#, fuzzy
-msgid "Surename"
-msgstr "Имя сервера"
-
 #: html/getxls.php:236
 #, fuzzy
 msgid "Title"
@@ -12697,7 +17057,7 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Удалить"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/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 "
@@ -12710,15 +17070,14 @@ msgstr ""
 "установить минимальное значение. Кроме того, будет очень полезно "
 "использовать фильтры для просмотра только ограниченного количества объектов."
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/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
+#: 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 ""
@@ -12728,35 +17087,36 @@ 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"
+#: ihtml/themes/default/login.tpl:14
+#, fuzzy
+msgid "Please use your username and password 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
+#: ihtml/themes/default/login.tpl:57
 msgid "Sign in"
 msgstr "Войти"
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/default/login.tpl:58
 msgid "Click here to log in"
 msgstr "Нажмите на эту кнопку, чтобы войти в систему"
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+#: ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Конфликт сеансов"
 
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/conflict.tpl:6
+#, fuzzy
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
 "you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the <b>Logout</b> button will close this session."
+"possible. Pressing the Logout button will close this session."
 msgstr ""
 "Возможно, есть еще один экземпляр вашего сеанса. Работа с несколькими окнами "
 "одновременно технически невозможна и в значительной мере зависит от "
@@ -12764,7 +17124,7 @@ msgstr ""
 "(например, IE и Mozilla) возможно. Нажав на кнопку <b>Выход</b>, вы "
 "завершите текущий сеанс."
 
-#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/default/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -12772,22 +17132,22 @@ msgstr ""
 "Если вы ничего не предпримете, редактируемые вами данные не будут сохранены, "
 "поэтому закройте все окна, кроме одного, и начните сеанс заново."
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/default/conflict.tpl:14
 msgid "Logout"
 msgstr "Выход"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Добро пожаловать в раздел настройки GOsa!"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
+#, fuzzy
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
 "configuration by performing three major steps: first we'll check the PHP "
 "installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
+"needed programms and after you've provided basic information for your LDAP "
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 "Судя по всему, вы запустили GOsa впервые: файл настройки не найден. Этот "
@@ -12796,97 +17156,81 @@ msgstr ""
 "затем - установлены ли дополнительные/необходимые программы, а потом вы "
 "укажете параметры работы с LDAP-сервером, и мы проверим его настройку."
 
-#: ihtml/themes/altlinux/framework.tpl:15
+#: ihtml/themes/default/setup_introduction.tpl:17
+msgid ""
+"You can also use the new and more-advanced way of inspecting your PHP-"
+"installation. It will give you information about the exact function that "
+"could not be found (functions that could be found are not mentioned). This "
+"is useful if you know what you're doing."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:19
+msgid "Toggle Show/Hide"
+msgstr ""
+
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
 msgstr "Начало"
 
-#: ihtml/themes/altlinux/framework.tpl:20
 #: ihtml/themes/default/framework.tpl:20
 msgid "Help"
 msgstr "Справка"
 
-#: ihtml/themes/altlinux/framework.tpl:25
 #: ihtml/themes/default/framework.tpl:25
 msgid "Sign out"
 msgstr "Выход"
 
-#: ihtml/themes/altlinux/framework.tpl:33
 #: ihtml/themes/default/framework.tpl:33
 msgid "Signed in:"
 msgstr "Пользователь:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr "Конфликт блокировок"
 
-#: ihtml/themes/altlinux/islocked.tpl:9
+#: 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 delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the 'Edit anyway' 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
 #: ihtml/themes/default/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
 msgid "Setup continued..."
 msgstr "Продолжение настройки..."
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
-msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
-msgstr ""
-"На втором шаге происходит поиск вспомогательных программ и проверка "
-"допустимости их версии."
-
-#: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
-msgid ""
-"Now we're going include your LDAP server and create an initial "
-"configuration. After you've entered the server URI below, a quick check is "
-"performed if required LDAP schemas are in place. Samba versions are "
-"autodetected by the installed objectclasses. Details on how your LDAP tree "
-"is organized will be asked later on."
-msgstr ""
-"Сейчас произойдет настройка вашего LDAP-сервера. После того, как вы введете "
-"адрес сервера ниже, будет выполнена быстрая проверка необходимых схем LDAP. "
-"Samba-версии определяются автоматически по установленным классам объектов. "
-"Подробности об организации вашего дерева LDAP понадобятся позже."
-
-#: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
-msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"<i>(Example: ldap://your.server:389).</i>"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_step4.tpl:2
 #: ihtml/themes/default/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:7
 #: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Введите описание владельца каталога"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:11
 #: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Местоположение"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:18
 #: ihtml/themes/default/setup_step4.tpl:18
 #, fuzzy
 msgid ""
@@ -12901,17 +17245,10 @@ msgstr ""
 "работало, укажите DN (уникальное имя) администратора и соответствующий "
 "пароль."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
 #: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN администратора"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Пароль администратора"
-
-#: ihtml/themes/altlinux/setup_step4.tpl:34
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -12922,33 +17259,27 @@ msgstr ""
 "сохраняемой информации о пользователях и группах, а также на способ создания "
 "учетных записей. Проверьте, подходят ли вам значения, указанные ниже."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:39
 #: ihtml/themes/default/setup_step4.tpl:39
 #, fuzzy
 msgid "Base "
 msgstr "Ветка"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:43
 #: ihtml/themes/default/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Структурная единица (OU) пользователей"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:47
 #: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Атрибут DN пользователей"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:55
 #: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "OU групп"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:59
 #: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "База идентификаторов для пользователей/групп"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:67
 #: ihtml/themes/default/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
@@ -12956,12 +17287,10 @@ msgid ""
 "used here, too."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:72
 #: ihtml/themes/default/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:83
 #: ihtml/themes/default/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
@@ -12969,67 +17298,107 @@ msgid ""
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:88
 #: ihtml/themes/default/setup_step4.tpl:88
 #, fuzzy
 msgid "Mail method"
 msgstr "Почтовые настройки"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
 "GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting. "
-"(But it  could be a security risk)  "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+
+#: ihtml/themes/default/setup_step4.tpl:104
+#, fuzzy
+msgid "Display PHP errors"
+msgstr "Ошибка LDAP:"
+
+#: ihtml/themes/default/setup_step4.tpl:107
+#, fuzzy
+msgid "true"
+msgstr "Улица"
+
+#: ihtml/themes/default/setup_step4.tpl:108
+#, fuzzy
+msgid "false"
+msgstr "женский"
+
+#: ihtml/themes/default/setup_step4.tpl:115
+msgid "Check"
+msgstr "Проверить"
+
+#: ihtml/themes/default/setup_step2.tpl:4
+msgid ""
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
+msgstr ""
+"На втором шаге происходит поиск вспомогательных программ и проверка "
+"допустимости их версии."
+
+#: ihtml/themes/default/setup_step3.tpl:4
+msgid ""
+"Now we're going include your LDAP server and create an initial "
+"configuration. After you've entered the server URI below, a quick check is "
+"performed if required LDAP schemas are in place. Samba versions are "
+"autodetected by the installed objectclasses. Details on how your LDAP tree "
+"is organized will be asked later on."
+msgstr ""
+"Сейчас произойдет настройка вашего LDAP-сервера. После того, как вы введете "
+"адрес сервера ниже, будет выполнена быстрая проверка необходимых схем LDAP. "
+"Samba-версии определяются автоматически по установленным классам объектов. "
+"Подробности об организации вашего дерева LDAP понадобятся позже."
+
+#: ihtml/themes/default/setup_step3.tpl:10
+msgid ""
+"Please enter the server URI to allow the setup to connect your LDAP server "
+"(Example: ldap://your.server:389)."
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:103
-#: ihtml/themes/default/setup_step4.tpl:104
-#, fuzzy
-msgid "Display PHP errors"
-msgstr "Ошибка LDAP:"
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:106
-#: ihtml/themes/default/setup_step4.tpl:107
-#, fuzzy
-msgid "true"
-msgstr "Улица"
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:107
-#: ihtml/themes/default/setup_step4.tpl:108
+#: ihtml/themes/default/logout.tpl:10
 #, fuzzy
-msgid "false"
-msgstr "женский"
-
-#: ihtml/themes/altlinux/setup_step4.tpl:115
-#: ihtml/themes/default/setup_step4.tpl:115
-msgid "Check"
-msgstr "Проверить"
+msgid "Sign in again"
+msgstr "Войти"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:1
 #: ihtml/themes/default/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr "Настройка завершена"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:3
 #: ihtml/themes/default/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:7
 #: ihtml/themes/default/setup_finish.tpl:7
 #, fuzzy
 msgid "Schema Configuration"
 msgstr "Системная информация"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
 #, fuzzy
 msgid "Configuration File"
 msgstr "Настроить"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
@@ -13040,13 +17409,11 @@ msgstr ""
 "создания конфигурационного файла. Сохраните файл по этой ссылке как /etc/"
 "gosa/gosa/conf При необходимости, внесите свои изменения."
 
-#: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
 #, fuzzy
 msgid "Download configuration"
 msgstr "Системная информация"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
@@ -13057,228 +17424,686 @@ msgstr ""
 "пользователь веб-сервера может его читать. Для этого вам, возможно, "
 "понадобится выполнить следующие команды:"
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+#: ihtml/themes/default/acl.tpl:2
+msgid "Assigned ACLs for current entry"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/default/acl.tpl:4
+#, fuzzy
+msgid "New ACL"
+msgstr "Создать"
+
+#: ihtml/themes/default/acl.tpl:8
+#, fuzzy
+msgid "ACL type"
+msgstr "Тип"
+
+#: ihtml/themes/default/acl.tpl:8
+#, fuzzy
+msgid "Select an acl type"
+msgstr "Выберите, чтобы просмотреть серверы"
+
+#: ihtml/themes/default/acl.tpl:15
+msgid "Use members from"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl:29
+#, fuzzy
+msgid "Available members"
+msgstr "Доступные приложения"
+
+#: ihtml/themes/default/acl.tpl:55
+#, fuzzy
+msgid "List of available ACL categories"
+msgstr "Выберите тип мыши"
+
+#: ihtml/themes/default/acl.tpl:63
+msgid "ACLs for this object"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:4
 msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:21
+#, fuzzy
+msgid "Operation complete"
+msgstr "не полный"
+
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+#, fuzzy
+msgid "Old Password"
+msgstr "Пароль"
+
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+#, fuzzy
+msgid "New Password"
+msgstr "Новый пароль"
+
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+#, fuzzy
+msgid "Verify Password"
+msgstr "Пароль"
+
+#: ihtml/themes/default/accountexpired.tpl:51
 #, fuzzy
+msgid "Change Password"
+msgstr "Сменить пароль"
+
+#: ihtml/themes/default/accountexpired.tpl:52
+#, fuzzy
+msgid "Click here to Change your password"
+msgstr "У вас недостаточно прав для смены своего пароля."
+
+#: ihtml/themes/default/snapshotdialog.tpl:3
+#, fuzzy
+msgid "Restoring object snapshots"
+msgstr "Объект группы"
+
+#: ihtml/themes/default/snapshotdialog.tpl:6
 msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic information for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+"This procedure will restore a snapshot of the selected object. It will "
+"replace the existing object after pressing the restore button."
 msgstr ""
-"Судя по всему, вы запустили GOsa впервые: файл настройки не найден. Этот "
-"сценарий поможет вам создать рабочую конфигурацию. Настройка делится на три "
-"основные стадии: сначала проверим, установлены ли необходимые модули PHP, "
-"затем - установлены ли дополнительные/необходимые программы, а потом вы "
-"укажете параметры работы с LDAP-сервером, и мы проверим его настройку."
 
-#: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/default/snapshotdialog.tpl:23
+msgid "There is no snapshot available that could be restored"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:25
+msgid "Choose a snapshot and click the folder image, to restore the snapshot"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#, fuzzy
+msgid "Creating object snapshots"
+msgstr "Объект группы"
+
+#: ihtml/themes/default/snapshotdialog.tpl:47
 msgid ""
-"You can also use the new and more-advanced way of inspecting your PHP-"
-"installation. It will give you information about the exact function that "
-"could not be found (functions that could be found are not mentioned). This "
-"is useful if you know what you're doing."
+"This procedure will create a snapshot of the selected object. It will be "
+"stored inside a special branch of your directory system and can be restored "
+"later on."
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:19
-msgid "Toggle Show/Hide"
+#: ihtml/themes/default/snapshotdialog.tpl:62
+#, fuzzy
+msgid "Timestamp"
+msgstr "Таймаут (с)"
+
+#: ihtml/themes/default/snapshotdialog.tpl:71
+msgid "Reason for generating this snapshot"
 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>."
+#~ msgid "phpgwAccountExpires"
+#~ msgstr "Учетная запись"
+
+#, fuzzy
+#~ msgid "phpgwAccountType"
+#~ msgstr "Учетная запись"
+
+#~ msgid "Value specified as 'Files' is not valid."
+#~ msgstr "Значение поля \"Файлы\" некорректно."
+
+#~ msgid "Value specified as 'Size' is not valid."
+#~ msgstr "Значение поля \"Размер\" некорректно."
+
+#~ msgid "Value specified as 'Ratio' is not valid."
+#~ msgstr "Значение поля \"Отношение\" некорректно."
+
+#, fuzzy
+#~ msgid "mailEnabled"
+#~ msgstr "отключен"
+
+#, fuzzy
+#~ msgid "Connectivity  account"
+#~ msgstr "Подключение"
+
+#, fuzzy
+#~ msgid "GOsa intranet account"
+#~ msgstr "Создать телефонный аккаунт"
+
+#, fuzzy
+#~ msgid "Open groupware account"
+#~ msgstr "Учетная запись Groupware"
+
+#, fuzzy
+#~ msgid "Can't get quota information for '%s'."
+#~ msgstr "Не удается создать квоту IMAP. Ответ сервера: \"%s\"."
+
+#, fuzzy
+#~ msgid "Shadow last change"
+#~ msgstr "Показать телефоны"
+
+#, fuzzy
+#~ msgid "Device monitor"
+#~ msgstr "Новый пароль"
+
+#, fuzzy
+#~ msgid "Device case"
+#~ msgstr "Имя сервера"
+
+#, fuzzy
+#~ msgid "Device motherboard"
+#~ msgstr "Клавиатура"
+
+#, fuzzy
+#~ msgid "Device soundcard"
+#~ msgstr "Новый пароль"
+
+#, fuzzy
+#~ msgid "Device processor"
+#~ msgstr "Новый пароль"
+
+#, fuzzy
+#~ msgid "Device misc device"
+#~ msgstr "Сетевые устройства"
+
+#, fuzzy
+#~ msgid "Device ram"
+#~ msgstr "Имя сервера"
+
+#, fuzzy
+#~ msgid "Device hard disk drive"
+#~ msgstr "Сервер"
+
+#, fuzzy
+#~ msgid "Device drive"
+#~ msgstr "Имя сервера"
+
+#, fuzzy
+#~ msgid "Device controler"
+#~ msgstr "Номер телефона"
+
+#, fuzzy
+#~ msgid "Device pci device"
+#~ msgstr "Устройство отображения"
+
+#, fuzzy
+#~ msgid "Saving printer membership with dn %s failed "
+#~ msgstr "Показать подразделения"
+
+#, fuzzy
+#~ msgid "Kernel paramenter"
+#~ msgstr "Изменить параметры"
+
+#, fuzzy
+#~ msgid "Max queue lenght"
+#~ msgstr "Сервер"
+
+#, fuzzy
+#~ msgid " Announce frequency"
+#~ msgstr "Сообщение автоответчика"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "день"
+
+#, fuzzy
+#~ msgid "Keyboard modell"
+#~ msgstr "Выберите модель клавиатуры"
+
+#, fuzzy
+#~ msgid "Keyborad variant"
+#~ msgstr "Выберите вариант раскладки"
+
+#, fuzzy
+#~ msgid "Valume"
+#~ msgstr "Имя системы"
+
+#, fuzzy
+#~ msgid "Server indentifier"
+#~ msgstr "Номер дома"
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Стандартный сертификат"
+
+#, fuzzy
+#~ msgid "Vocation message"
+#~ msgstr "Сообщение автоответчика"
+
+#, fuzzy
+#~ msgid "Removing UNIX account failed"
+#~ msgstr "Удалить настройки эл. почты"
+
+#, fuzzy
+#~ msgid "Saving UNIX account failed"
+#~ msgstr "UNIX аккаунт"
+
+#, fuzzy
+#~ msgid "Adding environment information failed"
+#~ msgstr "Изменить свойства"
+
+#, fuzzy
+#~ msgid "Removing FAX account failed"
+#~ msgstr "Удалить настройки эл. почты"
+
+#, fuzzy
+#~ msgid "Saving addressbook entry failed"
+#~ msgstr "Показать объекты адресной книги"
+
+#, fuzzy
+#~ msgid "Removing FAI script failed"
+#~ msgstr "Атрибуты UNIX"
+
+#, fuzzy
+#~ msgid "Saving FAI template failed"
+#~ msgstr "Список подразделений"
+
+#, fuzzy
+#~ msgid "Removing FAI partition table failed"
+#~ msgstr "Дополнительные записи в fstab"
+
+#, fuzzy
+#~ msgid "Removing FAI partition table entry failed"
+#~ msgstr "Дополнительные записи в fstab"
+
+#, fuzzy
+#~ msgid "Saving FAI partition table entry failed"
+#~ msgstr "Дополнительные записи в fstab"
+
+#~ msgid "Apply this acl only for users own entries"
+#~ msgstr ""
+#~ "Применить эти права доступа только к собственным записям пользователей"
+
+#~ msgid "This 'dn' is no acl container."
+#~ msgstr "Это DN не содержит ACL."
+
+#~ msgid "All fields are writeable"
+#~ msgstr "Все поля доступны для записи"
+
+#, fuzzy
+#~ msgid "Removing application information failed"
+#~ msgstr "Информация об организации"
+
+#, fuzzy
+#~ msgid "Saving application information failed"
+#~ msgstr "Информация об организации"
+
+#, fuzzy
+#~ msgid "Removing application failed"
+#~ msgstr "Удалить приложения"
+
+#, 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."
+#~ msgstr ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "подразделения. Если у вас достаточно большое количество подразделений, вы "
+#~ "можете использовать групповое выделение."
+
+#~ msgid "Display departments matching"
+#~ msgstr "Шаблон для подразделений"
+
+#, fuzzy
+#~ msgid "Saving server failed"
+#~ msgstr "Показать подразделения"
+
+#, fuzzy
+#~ msgid "Updating DNS service failed"
+#~ msgstr "Удалить сервис DNS"
+
+#, fuzzy
+#~ msgid "Removing DNS entries failed"
+#~ msgstr "Удалить сервис DNS"
+
+#, fuzzy
+#~ msgid "Saving DNS entries failed"
+#~ msgstr "UNIX аккаунт"
+
+#, fuzzy
+#~ msgid "The attribute '%s' is empty or contains invalid characters."
+#~ msgstr "Неправильное указание таймаута '%s'"
+
+#, fuzzy
+#~ msgid "Removing kolab host entry failed"
+#~ msgstr "Показать объекты адресной книги"
+
+#, fuzzy
+#~ msgid "Removing terminal failed"
+#~ msgstr "Показать подразделения"
+
+#, fuzzy
+#~ msgid "Saving terminal failed"
+#~ msgstr "Показать подразделения"
+
+#, fuzzy
+#~ msgid "Saving Samba workstation failed"
+#~ msgstr "Приложение"
+
+#, fuzzy
+#~ msgid "Saving terminal to DNS object failed"
+#~ msgstr "Список подразделений"
 
-#: ihtml/themes/default/islocked.tpl:13
 #, fuzzy
-msgid "Edit anyway"
-msgstr "Редактиовать объект"
+#~ msgid "Removing phone failed"
+#~ msgstr "Удалить приложения"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
+#, fuzzy
+#~ msgid "Saving phone failed"
+#~ msgstr "Приложение"
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
+#, fuzzy
+#~ msgid "Saving phone queue failed"
+#~ msgstr "Аккаунт Proxy"
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr ""
+#, fuzzy
+#~ msgid "Removing phone queue failed"
+#~ msgstr "Удалить учетную запись POSIX"
 
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
-msgstr ""
+#, fuzzy
+#~ msgid "Removing phone macro failed"
+#~ msgstr "Удалить учетную запись POSIX"
 
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
-msgstr ""
+#, fuzzy
+#~ msgid "Saving phone macro failed"
+#~ msgstr "Аккаунт Proxy"
 
-#: ihtml/themes/default/logout.tpl:10
 #, fuzzy
-msgid "Sign in again"
-msgstr "Войти"
+#~ msgid "Saving phone macro parameters failed"
+#~ msgstr "Изменить дополнительные параметры приложения"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
-msgstr ""
+#, fuzzy
+#~ msgid "Saving phone conference failed"
+#~ msgstr "Аккаунт Proxy"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:4
-msgid ""
-"Some values need to be unique in the complete directory while some "
-"combinations make no sense. GOsa shows the relevant attributes. Please "
-"maintain the values below to fullfill the policies."
-msgstr ""
+#, fuzzy
+#~ msgid "Snapshot failed."
+#~ msgstr "Приложение"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:21
 #, fuzzy
-msgid "Operation complete"
-msgstr "не полный"
+#~ msgid "Overwrite existing entry"
+#~ msgstr "Экспорт объекта"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr "Готово"
+#, fuzzy
+#~ msgid "Removing DNS service failed"
+#~ msgstr "Удалить сервис DNS"
 
-#~ msgid "You have no permissions to create a printer on this 'Base'."
-#~ msgstr "У вас недостаточно прав для создания принтера в этой ветке."
+#, fuzzy
+#~ msgid "Remove Kolab extension"
+#~ msgstr "Удалить параметры"
 
 #, fuzzy
-#~ msgid "save"
-#~ msgstr "Сохранить"
+#~ msgid ""
+#~ "This server has kolab features enabled. You can disable them by clicking "
+#~ "below."
+#~ msgstr ""
+#~ "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+#~ "ниже."
 
-#~ msgid "Enter the filename of the kernel to use"
-#~ msgstr "Введите имя файла загружаемого ядра"
+#, fuzzy
+#~ msgid ""
+#~ "This server has kolab features disabled. You can enable them by clicking "
+#~ "below."
+#~ msgstr ""
+#~ "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+#~ "ниже."
 
-#~ msgid "Choose LDAP server to use for accounts and terminal management"
-#~ msgstr "Выберите LDAP-сервер для управления учетными записями и терминалами"
+#, fuzzy
+#~ msgid "Remove FAI repository extension."
+#~ msgstr "Удалить параметры"
 
 #, fuzzy
-#~ msgid "Settings for host entry #%s"
-#~ msgstr "Местоположение ветки"
+#~ msgid ""
+#~ "This server has FAI repository features enabled. You can disable them by "
+#~ "clicking below."
+#~ msgstr ""
+#~ "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+#~ "ниже."
 
 #, fuzzy
 #~ msgid ""
-#~ "The name '%s' can't be used as host entry, the name is already used in "
-#~ "this ldap tree."
-#~ msgstr "Пользователь с таким именем уже есть в этой ветке."
+#~ "This server has FAI repository features disabled. You can enable them by "
+#~ "clicking below."
+#~ msgstr ""
+#~ "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+#~ "ниже."
 
 #, fuzzy
+#~ msgid "configured for"
+#~ msgstr "Не настроено"
+
+#~ msgid "Databases"
+#~ msgstr "Базы данных"
+
 #~ msgid ""
-#~ "Can't rename '%s' to '%s',the destination name contains invalid "
-#~ "characters."
-#~ msgstr "Неправильное указание таймаута '%s'"
+#~ "It looks like you're calling GOsa for the first time - no configuration "
+#~ "was found. This setup like script will try to aid you in creating a "
+#~ "working configuration by performing three major steps: first we'll check "
+#~ "the PHP installation for required modules, than we're going to check for "
+#~ "optional/needed programms and after you've provided basic informations "
+#~ "for your LDAP connectivity, we're going to check your LDAP setup."
+#~ msgstr ""
+#~ "Судя по всему, вы запустили GOsa впервые: файл настройки не найден. Этот "
+#~ "сценарий поможет вам создать рабочую конфигурацию. Настройка делится на "
+#~ "три основные стадии: сначала проверим, установлены ли необходимые модули "
+#~ "PHP, затем - установлены ли дополнительные/необходимые программы, а потом "
+#~ "вы укажете параметры работы с LDAP-сервером, и мы проверим его настройку."
+
+#~ 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>."
 
 #, fuzzy
-#~ msgid "DFS Shares"
-#~ msgstr "сброс"
+#~ 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 "Go up one dfsshare"
-#~ msgstr "Подразделение"
+#~ msgid "New Entry"
+#~ msgstr "Принтер"
 
 #, fuzzy
-#~ msgid "Create new dfsshare"
-#~ msgstr "Создание нового объекта в"
+#~ msgid "Admin Toggle"
+#~ msgstr "Пользователи домена"
+
+#, fuzzy
+#~ msgid ""
+#~ "This account has %s features disabled. Posix features are needed for "
+#~ "openXchange accounts, enable them first."
+#~ msgstr ""
+#~ "В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
+#~ "атрибуты POSIX, включите сначала их использование."
+
+#, fuzzy
+#~ msgid ""
+#~ "This account has %s features disabled. Mail features are needed for "
+#~ "openXchange accounts, enable them first."
+#~ msgstr ""
+#~ "В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
+#~ "атрибуты POSIX, включите сначала их использование."
+
+#~ msgid "List of applications"
+#~ msgstr "Список приложений"
+
+#~ msgid "Display applications matching"
+#~ msgstr "Шаблон для приложений"
+
+#~ msgid "Regular expression for matching application names"
+#~ msgstr "Регулярное выражение, соответствующее именам приложений"
 
 #, fuzzy
-#~ msgid "You have no premissions to create a dfs share."
-#~ msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+#~ msgid "Zone entries"
+#~ msgstr "Настройки телефона"
+
+#, fuzzy
+#~ msgid "Select action to execute for this   group of terminals"
+#~ msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
 #, fuzzy
-#~ msgid "Dfs share already exists."
-#~ msgstr "Ð\9fодÑ\80азделение Ñ\81 Ñ\82аким именем Ñ\83же Ñ\81Ñ\83Ñ\89еÑ\81Ñ\82вÑ\83еÑ\82."
+#~ msgid " can't read/write any ppd informations."
+#~ msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
 
 #, fuzzy
-#~ msgid "Required Field \"Name of dfs Share\" is not set."
-#~ msgstr "Обязательное поле \"Имя\" не заполнено."
+#~ msgid ""
+#~ "Having a large size of lists, you might prefer the range selectors on top "
+#~ "of the select box."
+#~ msgstr ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "стоп-листы. Если у вас достаточно большое количество списков, вы можете "
+#~ "использовать групповое выделение."
 
 #, fuzzy
-#~ msgid "Required Field \"Description\" is not set."
-#~ msgstr "Обязательное поле \"Описание\" не заполнено."
+#~ msgid "New         Blocklist"
+#~ msgstr "\"Черные списки\""
 
 #, fuzzy
-#~ msgid "Required Field \"Fileserver\" is not set."
-#~ msgstr "Обязательное поле \"Имя\" не заполнено."
+#~ msgid ""
+#~ "You may want to use the range selector on top of the group listbox, when "
+#~ "working with a large number of groups."
+#~ msgstr ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "группы пользователей. Если у вас их достаточно большое количество, вы "
+#~ "можете использовать групповое выделение."
 
 #, fuzzy
-#~ msgid "Required Field \"Share on fileserver\" is not set."
-#~ msgstr "Обязательное поле \"Имя\" не заполнено."
+#~ msgid ""
+#~ "You may want to use the range selector on top of the application listbox, "
+#~ msgstr ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "группы пользователей. Если у вас их достаточно большое количество, вы "
+#~ "можете использовать групповое выделение."
 
 #, fuzzy
-#~ msgid "Required Field \"Location\" is not set."
-#~ msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eпиÑ\81ание\" не заполнено."
+#~ msgid "when working with a large number of applications."
+#~ msgstr "Ð\9fÑ\83Ñ\82Ñ\8c и/или имÑ\8f иÑ\81полнÑ\8fемого Ñ\84айла пÑ\80иложениÑ\8f"
 
 #, 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."
+#~ "Having a large size of departments, you might prefer the range selectors "
+#~ "on   top of the department list."
 #~ msgstr ""
 #~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
 #~ "подразделения. Если у вас достаточно большое количество подразделений, вы "
 #~ "можете использовать групповое выделение."
 
 #, fuzzy
-#~ msgid "Display dfs shares matching"
-#~ msgstr "Показать подходяшие адреса"
+#~ msgid ""
+#~ "You may want to use the range selector on top of the group listbox, when "
+#~ "working with  a large number of groups."
+#~ msgstr ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "группы пользователей. Если у вас их достаточно большое количество, вы "
+#~ "можете использовать групповое выделение."
+
+#, fuzzy
+#~ msgid "You may want to use the range selector on top of the macro listbox, "
+#~ msgstr ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "группы пользователей. Если у вас их достаточно большое количество, вы "
+#~ "можете использовать групповое выделение."
+
+#, fuzzy
+#~ msgid ""
+#~ "This menu allows you to create, delete and edit selected phone "
+#~ "conferences. "
+#~ msgstr ""
+#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+#~ "стоп-листы. Если у вас достаточно большое количество списков, вы можете "
+#~ "использовать групповое выделение."
+
+#, fuzzy
+#~ msgid "selectors on top of the conferences list."
+#~ msgstr "Введите корректный номер телефона!"
+
+#~ msgid "Display lists matching"
+#~ msgstr "Шаблон для стоп-листов"
+
+#, fuzzy
+#~ msgid "Display object groups matching"
+#~ msgstr "Показать совпадения объектов"
+
+#~ msgid "UNIX accounts"
+#~ msgstr "UNIX аккаунт"
+
+#~ msgid "Thin Clients"
+#~ msgstr "Тонкие клиенты"
+
+#, fuzzy
+#~ msgid "Groupname"
+#~ msgstr "Группа"
 
 #, fuzzy
-#~ msgid "Regular expression for matching dfs share names"
+#~ msgid "Set root password"
+#~ msgstr "Изменить пароль"
+
+#~ msgid "Regular expression for matching system names"
 #~ msgstr "Регулярное выражение, соответствующее именам систем"
 
+#~ msgid "User name of which terminal(s) are shown"
+#~ msgstr "Имя пользователя, для которого перечисляются терминалы"
+
 #, fuzzy
-#~ msgid "DFS Properties"
-#~ msgstr "Свойства"
+#~ msgid "Please select a valid ppd."
+#~ msgstr "Введите корректный серийный номер"
+
+#~ msgid " Please choose another name."
+#~ msgstr " Введите другое имя."
+
+#~ msgid "Can't bind to LDAP. No schema check possible!"
+#~ msgstr "Не удается начать сеанс на LDAP-сервере. Проверка схем невозможна!"
 
 #, fuzzy
-#~ msgid "Name of dfs Share"
-#~ msgstr "Ð\9fодÑ\80азделение"
+#~ msgid "Choose a template to delete or edit"
+#~ msgstr "Ð\92Ñ\8bбÑ\80аÑ\82Ñ\8c Ñ\80аздел, длÑ\8f Ñ\85Ñ\80анениÑ\8f обÑ\8aекÑ\82а"
 
 #, fuzzy
-#~ msgid "Fileserver"
-#~ msgstr "Сервер"
+#~ msgid "save"
+#~ msgstr "Сохранить"
+
+#~ msgid "Enter the filename of the kernel to use"
+#~ msgstr "Введите имя файла загружаемого ядра"
+
+#~ msgid "Choose LDAP server to use for accounts and terminal management"
+#~ msgstr "Выберите LDAP-сервер для управления учетными записями и терминалами"
 
 #, fuzzy
-#~ msgid "Share on Fileserver"
-#~ msgstr "СлÑ\83жба пеÑ\87аÑ\82и"
+#~ msgid "Settings for host entry #%s"
+#~ msgstr "Ð\9cеÑ\81Ñ\82оположение веÑ\82ки"
 
 #, fuzzy
-#~ msgid "DFS Location"
-#~ msgstr "Местоположение"
+#~ msgid ""
+#~ "The name '%s' can't be used as host entry, the name is already used in "
+#~ "this ldap tree."
+#~ msgstr "Пользователь с таким именем уже есть в этой ветке."
 
 #, fuzzy
-#~ msgid "DFS shares"
-#~ msgstr "сброс"
+#~ msgid ""
+#~ "Can't rename '%s' to '%s',the destination name contains invalid "
+#~ "characters."
+#~ msgstr "Неправильное указание таймаута '%s'"
 
 #, fuzzy
-#~ msgid "Complete"
-#~ msgstr "не полный"
+#~ msgid "DFS shares"
+#~ msgstr "сброс"
 
 #, fuzzy
 #~ msgid "Successfully finished"
@@ -13308,14 +18133,6 @@ msgstr "Готово"
 #~ msgid "Add inventory service"
 #~ msgstr "Добавить сервис DNS"
 
-#, fuzzy
-#~ msgid "Monitor"
-#~ msgstr "Мониторинг"
-
-#, fuzzy
-#~ msgid "Other devices"
-#~ msgstr "Сетевые устройства"
-
 #, fuzzy
 #~ msgid "Controllers"
 #~ msgstr "Страна"
@@ -13336,29 +18153,14 @@ msgstr "Готово"
 #~ msgid "Nfs Export"
 #~ msgstr "Экспорт"
 
-#, fuzzy
-#~ msgid "Domain name service"
-#~ msgstr "Сканер"
-
 #, fuzzy
 #~ msgid "DNS-Zone"
 #~ msgstr "нет"
 
-#, fuzzy
-#~ msgid "DNS-TTL"
-#~ msgstr "DNS"
-
-#~ msgid "Network settings"
-#~ msgstr "Сетевые настройки"
-
 #, fuzzy
 #~ msgid "close"
 #~ msgstr "Выбрать"
 
-#, fuzzy
-#~ msgid "Current base"
-#~ msgstr "Текущий пароль"
-
 #, fuzzy
 #~ msgid "mailto"
 #~ msgstr "Email"
@@ -13383,14 +18185,6 @@ msgstr "Готово"
 #~ msgid "Append new class names"
 #~ msgstr "Доступные приложения"
 
-#, fuzzy
-#~ msgid "Repositories"
-#~ msgstr "Повторить"
-
-#, fuzzy
-#~ msgid "Search filter"
-#~ msgstr "Поиск"
-
 #, fuzzy
 #~ msgid "There is no useable package list defined."
 #~ msgstr "Файл небыл загружен"
@@ -13415,18 +18209,10 @@ msgstr "Готово"
 #~ msgid "No mysql extension loaded, can't connect to mysql server."
 #~ msgstr "Выберите способ подключения к серверу терминалов"
 
-#, fuzzy
-#~ msgid "Account expiry"
-#~ msgstr "Учетная запись"
-
 #, fuzzy
 #~ msgid "Can change password"
 #~ msgstr "Сменить пароль"
 
-#, fuzzy
-#~ msgid "Password expiry"
-#~ msgstr "Срок действия пароля истекает"
-
 #, fuzzy
 #~ msgid "Home path"
 #~ msgstr "Домашний телефон"
@@ -13439,10 +18225,6 @@ msgstr "Готово"
 #~ msgid "Samba domain name"
 #~ msgstr "Домашний каталог Samba"
 
-#, fuzzy
-#~ msgid "Allow password change"
-#~ msgstr "Новый пароль"
-
 #, fuzzy
 #~ msgid "Lock account"
 #~ msgstr "Удалить учетную запись Samba"
@@ -13506,9 +18288,6 @@ msgstr "Готово"
 #~ msgid "st"
 #~ msgstr "сброс"
 
-#~ msgid "Edit optional application parameters"
-#~ msgstr "Изменить дополнительные параметры приложения"
-
 #, fuzzy
 #~ msgid "Adress"
 #~ msgstr "Адрес"
@@ -13590,10 +18369,6 @@ msgstr "Готово"
 #~ msgid "pager"
 #~ msgstr "Пейджер"
 
-#, fuzzy
-#~ msgid "Nagios Auth"
-#~ msgstr "Контакт"
-
 #, fuzzy
 #~ msgid "authorized_for_system_information"
 #~ msgstr "Системная информация"
@@ -13617,10 +18392,6 @@ msgstr "Готово"
 #~ msgid "Checking for function <b>%s</b>"
 #~ msgstr "Проверка поддержки gettext"
 
-#, fuzzy
-#~ msgid "Members:"
-#~ msgstr "Включаемые объекты"
-
 #, fuzzy
 #~ msgid "Initiales"
 #~ msgstr "Отчество"
@@ -13677,10 +18448,6 @@ msgstr "Готово"
 #~ msgstr ""
 #~ "Укажите дополнительные файловые системы для монтирования во время загрузки"
 
-#, fuzzy
-#~ msgid "Service"
-#~ msgstr "Сервисы"
-
 #, fuzzy
 #~ msgid "List of used class names"
 #~ msgstr "Выберите тип мыши"
@@ -13701,10 +18468,6 @@ msgstr "Готово"
 #~ msgid "Display printers of department"
 #~ msgstr "Показать номера из подразделения"
 
-#, fuzzy
-#~ msgid "Logon management"
-#~ msgstr "Управление подразделениями"
-
 #, fuzzy
 #~ msgid "Please enter a valid name. Only 0-9 a-Z are allowed here."
 #~ msgstr "Введите корректное имя пользователя!"
@@ -13721,26 +18484,14 @@ msgstr "Готово"
 #~ msgid "section"
 #~ msgstr "Действие"
 
-#, fuzzy
-#~ msgid "Profil server"
-#~ msgstr "Сервер для хранения запросов и временных файлов"
-
 #, fuzzy
 #~ msgid "Please enter a valid description."
 #~ msgstr "Введите корректный серийный номер"
 
-#, fuzzy
-#~ msgid "Please specify a script."
-#~ msgstr "Введите корректное имя пользователя!"
-
 #, fuzzy
 #~ msgid "Invalid character in description. Please enter a valid description."
 #~ msgstr "Введите корректное имя пользователя!"
 
-#, fuzzy
-#~ msgid "Please specify a description for this profile."
-#~ msgstr "Укажите корректный номер телефона."
-
 #, fuzzy
 #~ msgid "Please enter a description for your disk."
 #~ msgstr "Укажите корректный номер телефона."
@@ -13753,14 +18504,6 @@ msgstr "Готово"
 #~ msgid " value="
 #~ msgstr "По умолчанию"
 
-#, fuzzy
-#~ msgid " type="
-#~ msgstr "Тип"
-
-#, fuzzy
-#~ msgid "FAI management"
-#~ msgstr "Название"
-
 #, fuzzy
 #~ msgid "New script bundle"
 #~ msgstr "Принтер"
@@ -13785,10 +18528,6 @@ msgstr "Готово"
 #~ msgid "Delete object"
 #~ msgstr "Включаемые объекты"
 
-#, fuzzy
-#~ msgid "Script set"
-#~ msgstr "Путь к сценариям"
-
 #, fuzzy
 #~ msgid "Variable set"
 #~ msgstr "Переменная"
@@ -13813,10 +18552,6 @@ msgstr "Готово"
 #~ msgid "cancel"
 #~ msgstr "Отмена"
 
-#, fuzzy
-#~ msgid "Available class names."
-#~ msgstr "Доступные приложения"
-
 #, fuzzy
 #~ msgid "Create new FAI object - set of scripts."
 #~ msgstr "Объект группы"
@@ -13829,33 +18564,11 @@ msgstr "Готово"
 #~ msgid "Obtions"
 #~ msgstr "Параметры"
 
-#, fuzzy
-#~ msgid "FAI partition table entry"
-#~ msgstr "Дополнительные записи в fstab"
-
-#, fuzzy
-#~ msgid "FAI script set"
-#~ msgstr "Атрибуты UNIX"
-
-#, fuzzy
-#~ msgid ""
-#~ "This menu allows you to create, delete and edit selected FAI obejcts. "
-#~ "Having a large size of objects, you might prefer the range selectors on "
-#~ "top of this list."
-#~ msgstr ""
-#~ "С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-#~ "стоп-листы. Если у вас достаточно большое количество списков, вы можете "
-#~ "использовать групповое выделение."
-
 #, fuzzy
 #~ msgid ""
 #~ "Please enter a valid description for your disk. Only a-Z 0-9 are allowed."
 #~ msgstr "Введите корректное имя пользователя!"
 
-#, fuzzy
-#~ msgid "Object type"
-#~ msgstr "Имя объекта"
-
 #, fuzzy
 #~ msgid "Set voicemail password"
 #~ msgstr "Изменить пароль"
@@ -13867,9 +18580,6 @@ msgstr "Готово"
 #~ msgid "You need to specify a Phone PIN."
 #~ msgstr "Необходимо указать не менее одного телефонного номера!"
 
-#~ msgid "Default printer"
-#~ msgstr "Принтер по умолчанию"
-
 #, fuzzy
 #~ msgid "Name of Conference"
 #~ msgstr "Подразделение"
@@ -13970,9 +18680,6 @@ msgstr "Готово"
 #~ "для редактирования информации об этом подразделении. Перед удалением "
 #~ "подразделения вам нужно будет подтвердить свое решение."
 
-#~ msgid "Display subdepartments of"
-#~ msgstr "Подразделения в подразделении"
-
 #~ msgid "Thin client template for"
 #~ msgstr "Шаблон тонкого клиента для"
 
@@ -14057,10 +18764,6 @@ msgstr "Готово"
 #~ msgid "Value specified as 'Quota Size' is empty."
 #~ msgstr "Значение поля \"Размер\" некорректно."
 
-#, fuzzy
-#~ msgid "Value specified as 'Quota Size' is not valid."
-#~ msgstr "Значение поля \"Размер\" некорректно."
-
 #~ msgid ""
 #~ "If this is lock detection is false, the other person has obviously closed "
 #~ "the webbrowser during the edit operation. You may delete the lockfile in "