diff options
| author | Continuous Integration <ci@zabbix.com> | 2022-02-22 14:38:31 +0300 |
|---|---|---|
| committer | Continuous Integration <ci@zabbix.com> | 2022-02-22 14:38:31 +0300 |
| commit | 0fa1cc40450df3ca17410c2becbecca79dc85ebe (patch) | |
| tree | 5e3f883e07966174009f6f16cd360fa80628926d /ui/locale/ru/LC_MESSAGES | |
| parent | cce477d10496665900613d1994ae0d5de51cd1a2 (diff) | |
.......... [ZBX-1357] automatic translation file sync for trunk
Diffstat (limited to 'ui/locale/ru/LC_MESSAGES')
| -rw-r--r-- | ui/locale/ru/LC_MESSAGES/frontend.po | 2159 |
1 files changed, 1074 insertions, 1085 deletions
diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po index 8f58b95efff..40f684467ef 100644 --- a/ui/locale/ru/LC_MESSAGES/frontend.po +++ b/ui/locale/ru/LC_MESSAGES/frontend.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-02-04 12:09+0200\n" +"POT-Creation-Date: 2022-02-22 13:32+0200\n" "PO-Revision-Date: 2022-01-13 01:11+0300\n" "Last-Translator: Alexey <dotneft@gmail.com>\n" "Language-Team: Zabbix translation team\n" @@ -41,6 +41,7 @@ msgstr "\"%1$s\" вместо \"%2$s\"" #: include/classes/import/validators/C52XmlValidator.php:1993 #: include/classes/import/validators/C54XmlValidator.php:2048 #: include/classes/import/validators/C60XmlValidator.php:2050 +#: include/classes/import/validators/C62XmlValidator.php:2050 #, c-format msgid "\"%1$s\" is expected" msgstr "\"%1$s\" ожидалось" @@ -70,7 +71,7 @@ msgstr "\"hostid\" зависимого элемента данных и осн msgid "\"ruleid\" of dependent item and master item should match" msgstr "\"ruleid\" зависимого элемента данных и основного элемента данных должен совпадать" -#: include/forms.inc.php:1298 +#: include/forms.inc.php:1334 #: include/views/configuration.host.discovery.edit.php:900 #: include/views/js/configuration.host.discovery.edit.js.php:86 #: include/views/js/item.preprocessing.js.php:171 @@ -241,7 +242,7 @@ msgstr[0] "%1$s попытка осталась" msgstr[1] "%1$s попытки осталось" msgstr[2] "%1$s попыток осталось" -#: app/views/administration.user.edit.php:665 +#: app/views/administration.user.edit.php:667 #: include/classes/widgets/CWidgetConfig.php:306 #: include/classes/widgets/CWidgetConfig.php:307 include/func.inc.php:2562 #: jsLoader.php:157 jsLoader.php:158 @@ -321,11 +322,11 @@ msgstr "(Только супер администраторы могут соз msgid "(no proxy)" msgstr "(без прокси)" -#: include/classes/setup/CSetupWizard.php:492 +#: include/classes/setup/CSetupWizard.php:494 msgid "0 - use default port" msgstr "0 - использовать порт по умолчанию" -#: include/triggers.inc.php:1598 +#: include/triggers.inc.php:1595 msgid "0 or 1" msgstr "0 или 1" @@ -375,7 +376,7 @@ msgstr "500 последних значений" msgid "<empty string>" msgstr "<пустая строка>" -#: include/forms.inc.php:1370 include/views/js/item.preprocessing.js.php:220 +#: include/forms.inc.php:1406 include/views/js/item.preprocessing.js.php:220 msgid "<label name>" msgstr "<имя метки>" @@ -383,7 +384,7 @@ msgstr "<имя метки>" msgid "<manual>" msgstr "<вручную>" -#: include/forms.inc.php:1353 include/forms.inc.php:1378 +#: include/forms.inc.php:1389 include/forms.inc.php:1414 #: include/views/js/item.preprocessing.js.php:218 #: include/views/js/item.preprocessing.js.php:227 msgid "<metric name>{<label name>=\"<label value>\", ...} == <value>" @@ -420,11 +421,12 @@ msgstr "API токен" msgid "API token \"%1$s\" already exists for userid \"%2$s\"." msgstr "API токен \"%1$s\" уже существует у userid \"%2$s\"." -#: app/controllers/CControllerTokenCreate.php:98 +#: app/controllers/CControllerTokenCreate.php:78 +#: app/controllers/CControllerTokenCreate.php:100 msgid "API token added" msgstr "API токен добавлен" -#: app/controllers/CControllerTokenDelete.php:61 +#: app/controllers/CControllerTokenDelete.php:67 msgid "API token deleted" msgid_plural "API tokens deleted" msgstr[0] "API токен удален" @@ -449,24 +451,19 @@ msgstr[2] "API токенов активировано" msgid "API token expired." msgstr "Срок API токена истёк." -#: app/controllers/CControllerTokenUpdate.php:114 +#: app/controllers/CControllerTokenUpdate.php:75 +#: app/controllers/CControllerTokenUpdate.php:106 msgid "API token updated" msgstr "API токен обновлен" -#: app/controllers/CControllerTokenEdit.php:107 -#: app/controllers/CControllerTokenList.php:193 -#: app/controllers/CControllerTokenView.php:56 -#: app/controllers/CControllerUserTokenEdit.php:91 -#: app/controllers/CControllerUserTokenList.php:137 -#: app/controllers/CControllerUserTokenView.php:53 -#: app/views/administration.token.edit.php:31 -#: app/views/administration.token.list.php:101 -#: app/views/administration.token.view.php:27 -#: app/views/administration.user.token.edit.php:31 -#: app/views/administration.user.token.list.php:67 -#: app/views/administration.user.token.view.php:27 +#: app/controllers/CControllerPopupTokenEdit.php:114 +#: app/controllers/CControllerPopupTokenView.php:74 +#: app/controllers/CControllerTokenList.php:191 +#: app/controllers/CControllerUserTokenList.php:135 +#: app/views/administration.token.list.php:100 +#: app/views/administration.user.token.list.php:66 #: include/classes/helpers/CMenuHelper.php:274 -#: include/classes/helpers/CMenuHelper.php:397 include/html.inc.php:820 +#: include/classes/helpers/CMenuHelper.php:396 include/html.inc.php:820 #: include/html.inc.php:900 msgid "API tokens" msgstr "API токены" @@ -487,27 +484,27 @@ msgstr "Доступ запрещен" msgid "Access denied!" msgstr "Доступ запрещен!" -#: app/views/administration.user.edit.php:597 +#: app/views/administration.user.edit.php:599 #: app/views/administration.userrole.edit.php:271 msgid "Access to API" msgstr "Доступ к API" -#: app/views/administration.user.edit.php:450 +#: app/views/administration.user.edit.php:452 #: app/views/administration.userrole.edit.php:81 msgid "Access to UI elements" msgstr "Доступ к элементам веб-интерфейса" -#: app/views/administration.user.edit.php:626 +#: app/views/administration.user.edit.php:628 #: app/views/administration.userrole.edit.php:320 msgid "Access to actions" msgstr "Доступ к действиям" -#: app/views/administration.user.edit.php:568 +#: app/views/administration.user.edit.php:570 #: app/views/administration.userrole.edit.php:222 msgid "Access to modules" msgstr "Доступ к модулям" -#: app/views/administration.user.edit.php:472 +#: app/views/administration.user.edit.php:474 #: app/views/administration.userrole.edit.php:134 msgid "Access to services" msgstr "Доступ к услугам" @@ -557,7 +554,7 @@ msgstr "Подтвержденные РЕШЕННЫЕ события" #: app/views/administration.mediatype.list.php:87 #: app/views/administration.regex.edit.php:51 #: app/views/administration.script.edit.php:65 -#: app/views/administration.user.edit.php:294 +#: app/views/administration.user.edit.php:296 #: app/views/configuration.correlation.edit.php:57 #: app/views/monitoring.widget.actionlog.view.php:34 #: app/views/popup.dashboard.share.edit.php:32 @@ -678,7 +675,7 @@ msgstr "Действие обновлено" #: include/classes/screens/CScreenProblem.php:889 #: include/classes/screens/CScreenProblem.php:1158 #: include/classes/screens/CScreenProblem.php:1219 include/events.inc.php:291 -#: include/forms.inc.php:1227 include/views/configuration.action.edit.php:28 +#: include/forms.inc.php:1263 include/views/configuration.action.edit.php:28 #: include/views/monitoring.sysmap.list.php:73 jsLoader.php:132 #: jsLoader.php:163 jsLoader.php:172 jsLoader.php:199 jsLoader.php:213 #: jsLoader.php:352 tr_events.php:183 @@ -738,14 +735,12 @@ msgstr "Активно до" #: app/views/administration.regex.edit.php:163 #: app/views/administration.script.edit.php:86 #: app/views/administration.script.edit.php:274 -#: app/views/administration.token.edit.php:102 -#: app/views/administration.user.edit.php:368 -#: app/views/administration.user.edit.php:770 +#: app/views/administration.user.edit.php:370 +#: app/views/administration.user.edit.php:772 #: app/views/administration.usergroup.edit.php:143 #: app/views/administration.usergroup.edit.php:194 #: app/views/administration.usergroup.edit.php:233 #: app/views/administration.userrole.edit.php:380 -#: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:99 #: app/views/configuration.correlation.edit.php:176 #: app/views/configuration.dashboard.edit.php:60 @@ -789,13 +784,14 @@ msgstr "Активно до" #: app/views/popup.sla.edit.php:134 app/views/popup.sla.edit.php:192 #: app/views/popup.sla.edit.php:258 app/views/popup.sla.edit.php:286 #: app/views/popup.sla.excludeddowntime.edit.php:91 +#: app/views/popup.token.edit.php:152 #: app/views/popup.tophosts.column.edit.php:209 #: app/views/popup.tophosts.column.edit.php:254 #: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126 #: include/classes/helpers/CTagFilterFieldHelper.php:92 #: include/classes/widgets/CWidgetHelper.php:629 -#: include/classes/widgets/CWidgetHelper.php:700 include/forms.inc.php:1511 -#: include/forms.inc.php:2075 include/views/configuration.action.edit.php:135 +#: include/classes/widgets/CWidgetHelper.php:700 include/forms.inc.php:1547 +#: include/forms.inc.php:2111 include/views/configuration.action.edit.php:135 #: include/views/configuration.action.edit.php:299 #: include/views/configuration.action.edit.php:383 #: include/views/configuration.action.edit.php:459 @@ -998,7 +994,7 @@ msgstr "Адрес" msgid "Admin" msgstr "Администратор" -#: include/classes/helpers/CMenuHelper.php:332 +#: include/classes/helpers/CMenuHelper.php:331 #: include/classes/helpers/CRoleHelper.php:316 msgid "Administration" msgstr "Администрирование" @@ -1076,7 +1072,7 @@ msgstr "Интервал агрегации" msgid "Alert message" msgstr "Сообщение оповещения" -#: app/controllers/CControllerPopupTriggerExpr.php:1115 +#: app/controllers/CControllerPopupTriggerExpr.php:1116 msgid "Algorithm" msgstr "Алгоритм" @@ -1095,8 +1091,8 @@ msgstr "Выровнять элементы карты" #: app/views/administration.script.edit.php:219 #: app/views/administration.script.list.php:191 #: app/views/administration.script.list.php:192 -#: app/views/administration.user.edit.php:478 -#: app/views/administration.user.edit.php:523 +#: app/views/administration.user.edit.php:480 +#: app/views/administration.user.edit.php:525 #: app/views/administration.userrole.edit.php:143 #: app/views/administration.userrole.edit.php:184 #: app/views/monitoring.dashboard.list.php:65 @@ -1116,8 +1112,8 @@ msgid "All graphs" msgstr "" #: app/partials/administration.usergroup.grouprights.html.php:46 -#: app/views/administration.user.edit.php:423 -#: app/views/administration.user.edit.php:429 +#: app/views/administration.user.edit.php:425 +#: app/views/administration.user.edit.php:431 msgid "All groups" msgstr "Все группы" @@ -1159,7 +1155,7 @@ msgstr "Все шаблоны" msgid "Allow list" msgstr "Список разрешений" -#: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:994 +#: app/views/popup.massupdate.trigger.php:60 include/triggers.inc.php:991 #: include/views/configuration.trigger.prototype.edit.php:526 #: include/views/configuration.triggers.edit.php:554 msgid "Allow manual close" @@ -1172,11 +1168,11 @@ msgstr "Разрешить закрывать вручную" msgid "Allowed hosts" msgstr "Разрешенные хосты" -#: app/views/administration.user.edit.php:617 +#: app/views/administration.user.edit.php:619 msgid "Allowed methods" msgstr "Разрешенные методы" -#: include/classes/setup/CSetupWizard.php:880 +#: include/classes/setup/CSetupWizard.php:882 msgid "Alternatively, you can install it manually:" msgstr "В качестве альтернативы, вы можете установить его вручную:" @@ -1190,7 +1186,7 @@ msgstr "Общее количество потребляемой физичес #: app/partials/popup.operations.php:240 #: app/views/configuration.correlation.edit.php:117 -#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1064 +#: app/views/popup.lldoverride.php:68 include/triggers.inc.php:1061 #: include/views/configuration.action.edit.php:125 #: include/views/configuration.host.discovery.edit.php:751 #: include/views/configuration.trigger.prototype.edit.php:159 @@ -1232,9 +1228,9 @@ msgstr "" #: app/views/administration.module.list.php:52 #: app/views/administration.proxy.list.php:53 #: app/views/administration.script.list.php:50 -#: app/views/administration.token.list.php:93 +#: app/views/administration.token.list.php:92 #: app/views/administration.usergroup.list.php:52 -#: app/views/administration.user.token.list.php:59 +#: app/views/administration.user.token.list.php:58 #: app/views/configuration.correlation.list.php:55 #: app/views/configuration.discovery.list.php:55 #: app/views/configuration.host.list.php:131 @@ -1242,7 +1238,7 @@ msgstr "" #: app/views/service.list.edit.php:79 app/views/service.list.edit.php:107 #: app/views/service.list.php:82 app/views/sla.list.php:51 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36 -#: include/triggers.inc.php:1597 +#: include/triggers.inc.php:1594 #: include/views/configuration.action.list.php:79 #: include/views/configuration.maintenance.list.php:65 msgid "Any" @@ -1392,8 +1388,8 @@ msgstr "" msgid "At least one host group or host must be selected." msgstr "Должна быть выбрана по крайней мере одна группа узлов сети или узел сети." -#: include/classes/api/services/CHostGroup.php:1088 -#: include/classes/api/services/CHostGroup.php:1245 +#: include/classes/api/services/CHostGroup.php:1111 +#: include/classes/api/services/CHostGroup.php:1268 msgid "At least one host or template must be specified." msgstr "Должен быть указан по крайней мере один узел сети или шаблон." @@ -1465,8 +1461,7 @@ msgstr "Авг" msgid "August" msgstr "Август" -#: app/views/administration.token.view.php:38 -#: app/views/administration.user.token.view.php:37 +#: app/views/popup.token.view.php:46 msgid "Auth token" msgstr "Токен аутентификации" @@ -1478,7 +1473,7 @@ msgstr "Запросы AuthN" #: app/views/administration.authentication.edit.php:323 #: app/views/administration.authentication.edit.php:333 #: app/views/administration.mediatype.edit.php:88 -#: include/classes/helpers/CMenuHelper.php:288 +#: include/classes/helpers/CMenuHelper.php:287 #: include/classes/helpers/CRoleHelper.php:424 #: include/views/configuration.httpconf.edit.php:247 #: include/views/configuration.httpconf.list.php:138 @@ -1516,8 +1511,8 @@ msgstr "Пароль аутентификации" msgid "Authentication protocol" msgstr "Протокол аутентификации" -#: app/controllers/CControllerAuthenticationUpdate.php:393 -#: app/controllers/CControllerAuthenticationUpdate.php:401 +#: app/controllers/CControllerAuthenticationUpdate.php:395 +#: app/controllers/CControllerAuthenticationUpdate.php:403 msgid "Authentication settings updated" msgstr "Настройки аутентификации обновлены" @@ -1541,7 +1536,7 @@ msgctxt "history source selection method" msgid "Auto" msgstr "Авто" -#: app/views/administration.user.edit.php:255 +#: app/views/administration.user.edit.php:257 msgid "Auto-login" msgstr "Авто-вход" @@ -1549,7 +1544,7 @@ msgstr "Авто-вход" msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Опции авто-вход и авто-выход нельзя активировать вместе." -#: app/views/administration.user.edit.php:260 +#: app/views/administration.user.edit.php:262 msgid "Auto-logout" msgstr "Авто-выход" @@ -1628,7 +1623,7 @@ msgid "Axes" msgstr "Оси" #: include/classes/setup/CSetupWizard.php:334 -#: include/classes/setup/CSetupWizard.php:753 +#: include/classes/setup/CSetupWizard.php:755 msgid "Back" msgstr "Назад" @@ -1773,7 +1768,7 @@ msgstr "Переместить вперёд" msgid "Bring to front" msgstr "На передний план" -#: include/locales.inc.php:47 +#: include/locales.inc.php:34 msgid "Bulgarian (bg_BG)" msgstr "Болгарский (bg_BG)" @@ -1837,7 +1832,7 @@ msgstr "CRLF" msgid "CSV to JSON" msgstr "CSV в JSON" -#: include/classes/validators/CApiInputValidator.php:2706 +#: include/classes/validators/CApiInputValidator.php:2717 #: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "Ожидается CUID " @@ -1866,12 +1861,10 @@ msgstr "Callback" #: app/views/administration.regex.edit.php:155 #: app/views/administration.regex.edit.php:165 #: app/views/administration.script.edit.php:267 -#: app/views/administration.token.edit.php:96 -#: app/views/administration.user.edit.php:749 -#: app/views/administration.user.edit.php:780 +#: app/views/administration.user.edit.php:751 +#: app/views/administration.user.edit.php:782 #: app/views/administration.usergroup.edit.php:213 #: app/views/administration.userrole.edit.php:351 -#: app/views/administration.user.token.edit.php:78 #: app/views/configuration.correlation.edit.php:170 #: app/views/configuration.dashboard.edit.php:68 #: app/views/configuration.discovery.edit.php:139 @@ -1891,8 +1884,8 @@ msgstr "Callback" msgid "Cancel" msgstr "Отмена" -#: app/controllers/CControllerTokenCreate.php:44 -#: app/controllers/CControllerTokenCreate.php:105 +#: app/controllers/CControllerTokenCreate.php:45 +#: app/controllers/CControllerTokenCreate.php:109 msgid "Cannot add API token" msgstr "Не удалось добавить API токен" @@ -1927,7 +1920,7 @@ msgstr "Не удалось добавить страницу панели: уж msgid "Cannot add dependency from a host to a template." msgstr "Не удалось добавить зависимость от узла сети к шаблону." -#: include/classes/api/services/CDiscoveryRule.php:886 +#: include/classes/api/services/CDiscoveryRule.php:889 #: include/triggers.inc.php:371 #, c-format msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"." @@ -1954,7 +1947,7 @@ msgstr "Не удалось добавить группу" msgid "Cannot add host" msgstr "Не удалось добавить узел сети" -#: host_prototypes.php:288 +#: host_prototypes.php:304 msgid "Cannot add host prototype" msgstr "Не удалось добавить прототип узлов сети" @@ -2009,7 +2002,7 @@ msgid "Cannot add network map" msgstr "Не удалось добавить карту сети" #: app/controllers/CControllerProxyCreate.php:58 -#: app/controllers/CControllerProxyCreate.php:121 +#: app/controllers/CControllerProxyCreate.php:122 msgid "Cannot add proxy" msgstr "Не удалось добавить прокси" @@ -2074,9 +2067,9 @@ msgstr "Не удалось привязать анонимно к LDAP серв msgid "Cannot bind to LDAP server." msgstr "Не удалось привязать к LDAP серверу." -#: include/forms.inc.php:1896 include/forms.inc.php:1903 -#: include/forms.inc.php:1913 include/forms.inc.php:1947 -#: include/forms.inc.php:1954 include/forms.inc.php:1964 +#: include/forms.inc.php:1932 include/forms.inc.php:1939 +#: include/forms.inc.php:1949 include/forms.inc.php:1983 +#: include/forms.inc.php:1990 include/forms.inc.php:2000 #, c-format msgid "Cannot build expression tree: %1$s." msgstr "Не удалось построить дерево выражения: %1$s." @@ -2089,21 +2082,17 @@ msgstr "Не удалось изменить тип пользователя с msgid "Cannot clear history" msgstr "Не удалось очистить историю" -#: include/classes/api/services/CDiscoveryRule.php:2511 +#: include/classes/api/services/CDiscoveryRule.php:2514 msgid "Cannot clone graph prototypes." msgstr "Не удалось клонировать прототипы графиков." -#: include/classes/api/services/CDiscoveryRule.php:2567 -msgid "Cannot clone host prototypes." -msgstr "Не удалось клонировать прототипы узлов сети." - -#: include/classes/api/services/CDiscoveryRule.php:2314 -#: include/classes/api/services/CDiscoveryRule.php:2370 -#: include/classes/api/services/CDiscoveryRule.php:2388 +#: include/classes/api/services/CDiscoveryRule.php:2317 +#: include/classes/api/services/CDiscoveryRule.php:2373 +#: include/classes/api/services/CDiscoveryRule.php:2391 msgid "Cannot clone item prototypes." msgstr "Не удалось клонировать прототипы элементов данных." -#: include/classes/api/services/CDiscoveryRule.php:799 +#: include/classes/api/services/CDiscoveryRule.php:802 msgid "Cannot clone trigger prototypes." msgstr "Не удалось клонировать прототипы триггеров." @@ -2116,7 +2105,7 @@ msgstr "Не удалось закрыть проблему: %1$s." msgid "Cannot connect to LDAP server." msgstr "Не удалось подключиться к LDAP серверу." -#: include/classes/setup/CSetupWizard.php:591 +#: include/classes/setup/CSetupWizard.php:593 msgid "Cannot connect to the database." msgstr "Не возможно подключиться к базе данных." @@ -2124,7 +2113,7 @@ msgstr "Не возможно подключиться к базе данных. msgid "Cannot convert POST data:" msgstr "Не удалось выполнить конвертацию POST данных:" -#: graphs.php:388 +#: graphs.php:390 msgid "Cannot copy graph" msgid_plural "Cannot copy graphs" msgstr[0] "Не удалось скопировать график" @@ -2150,7 +2139,7 @@ msgstr[2] "Не удалось скопировать триггеры" msgid "Cannot copy trigger \"%1$s:%2$s\", because it has multiple hosts in the expression." msgstr "Не удалось скопировать триггер \"%1$s:%2$s\", потому что он содержит несколько узлов сети в выражении." -#: include/classes/api/services/CHostPrototype.php:291 +#: include/classes/api/services/CHostPrototype.php:1110 #, c-format msgid "Cannot create a host prototype on a discovered host \"%1$s\"." msgstr "Не удалось создать прототип узлов сети у обнаруженного узла сети \"%1$s\"." @@ -2191,7 +2180,7 @@ msgstr "Не удалось создать регулярный отчет" msgid "Cannot create service \"%1$s\": %2$s." msgstr "Не удалось создать услугу \"%1$s\": %2$s." -#: include/classes/setup/CSetupWizard.php:876 +#: include/classes/setup/CSetupWizard.php:878 msgid "Cannot create the configuration file." msgstr "Не возможно создать конфигурационный файл." @@ -2200,7 +2189,7 @@ msgstr "Не возможно создать конфигурационный ф msgid "Cannot create user role" msgstr "Не удалось создать роль пользователя" -#: app/controllers/CControllerTokenDelete.php:64 +#: app/controllers/CControllerTokenDelete.php:76 msgid "Cannot delete API token" msgid_plural "Cannot delete API tokens" msgstr[0] "Не удалось удалить API токен" @@ -2286,23 +2275,23 @@ msgstr[2] "Не удалось удалить группы" msgid "Cannot delete host" msgstr "Не удалось удалить узел сети" -#: include/classes/api/services/CHost.php:1355 +#: include/classes/api/services/CHost.php:1379 #, c-format -msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one host or host group." -msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." -msgstr[0] "Не удалось удалить узел сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети." -msgstr[1] "Не удалось удалить выбранные узлы сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети." -msgstr[2] "Не удалось удалить выбранные узлы сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети." +msgid "Cannot delete host %1$s because maintenance \"%2$s\" must contain at least one host or host group." +msgid_plural "Cannot delete hosts %1$s because maintenance \"%2$s\" must contain at least one host or host group." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: include/classes/api/services/CHostGroup.php:826 +#: include/classes/api/services/CHostGroup.php:849 #, c-format -msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." -msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." -msgstr[0] "Не удалось удалить группу узлов сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети." -msgstr[1] "Не удалось удалить группы узлов сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети." -msgstr[2] "Не удалось удалить групп узлов сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети." +msgid "Cannot delete host group %1$s because maintenance \"%2$s\" must contain at least one host or host group." +msgid_plural "Cannot delete host groups %1$s because maintenance \"%2$s\" must contain at least one host or host group." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: host_prototypes.php:147 host_prototypes.php:340 +#: host_prototypes.php:147 host_prototypes.php:356 msgid "Cannot delete host prototypes" msgstr "Не удалось удалить прототипы узлов сети" @@ -2429,10 +2418,6 @@ msgstr "Не удалось удалить прототип графиков у msgid "Cannot delete templated graph." msgstr "Не удалось удалить график унаследованный из шаблона." -#: include/classes/api/services/CHostPrototype.php:1317 -msgid "Cannot delete templated host prototype." -msgstr "Невозможно удалить прототип узлов сети унаследованный из шаблона." - #: include/classes/api/services/CItemPrototype.php:663 msgid "Cannot delete templated item prototype." msgstr "Не удалось удалить прототип элементов данных унаследованный из шаблона." @@ -2720,13 +2705,13 @@ msgstr "Не удалось найти узел сети \"%1$s\" использ msgid "Cannot find host \"%1$s\" used in map \"%2$s\"." msgstr "Не удалось найти узел сети \"%1$s\" используемый на карте сети \"%2$s\"." -#: include/classes/import/CConfigurationImport.php:1212 +#: include/classes/import/CConfigurationImport.php:1211 #, c-format msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "Не удалось найти группу узлов сети \"%1$s\" для прототипа узлов сети \"%2$s\" правила обнаружения \"%3$s\" на \"%4$s\"." -#: include/classes/api/services/CDiscoveryRule.php:2143 -#: include/classes/api/services/CDiscoveryRule.php:2347 +#: include/classes/api/services/CDiscoveryRule.php:2146 +#: include/classes/api/services/CDiscoveryRule.php:2350 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526 #: include/items.inc.php:701 #, c-format @@ -2753,37 +2738,37 @@ msgstr "Не удалось найти интерфейс \"%1$s\" исполь msgid "Cannot find interface \"%1$s\" used for item \"%2$s\" on \"%3$s\"." msgstr "Не удалось найти интерфейс \"%1$s\" используемый элементом данных \"%2$s\" на \"%3$s\"." -#: include/classes/import/CConfigurationImport.php:1106 +#: include/classes/import/CConfigurationImport.php:1105 #, c-format msgid "Cannot find interface \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "Не удалось найти интерфейс \"%1$s\" используемый прототипом элементов данных \"%2$s\" правила обнаружения \"%3$s\" на \"%4$s\"." -#: include/classes/import/CConfigurationImport.php:1641 +#: include/classes/import/CConfigurationImport.php:1601 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph \"%3$s\"." msgstr "Не удалось найти элемент данных \"%1$s\" у \"%2$s\", используемый как MAX значение оси Y в графике \"%3$s\"." -#: include/classes/import/CConfigurationImport.php:1413 +#: include/classes/import/CConfigurationImport.php:1373 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "Не удалось найти элемент данных \"%1$s\" у \"%2$s\", используемый как MAX значение оси Y в прототипе графиков \"%3$s\" правила обнаружения \"%4$s\" у \"%5$s\"." -#: include/classes/import/CConfigurationImport.php:1623 +#: include/classes/import/CConfigurationImport.php:1583 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph \"%3$s\"." msgstr "Не удалось найти элемент данных \"%1$s\" у \"%2$s\", используемый как MIN значение оси Y в графике \"%3$s\"." -#: include/classes/import/CConfigurationImport.php:1392 +#: include/classes/import/CConfigurationImport.php:1352 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "Не удалось найти элемент данных \"%1$s\" у \"%2$s\", используемый как MIN значение оси Y в прототипе графиков \"%3$s\" правила обнаружения \"%4$s\" у \"%5$s\"." -#: include/classes/import/CConfigurationImport.php:1661 +#: include/classes/import/CConfigurationImport.php:1621 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"." msgstr "Не удалось найти элемент данных \"%1$s\" у \"%2$s\", используемый в графике \"%3$s\"." -#: include/classes/import/CConfigurationImport.php:1434 +#: include/classes/import/CConfigurationImport.php:1394 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "Не удалось найти элемент данных \"%1$s\" у \"%2$s\", используемый в прототипе графиков \"%3$s\" правила обнаружения \"%4$s\" у \"%5$s\"." @@ -2798,7 +2783,7 @@ msgstr "Не удалось найти элемент данных \"%1$s\" ис msgid "Cannot find map \"%1$s\" used in map \"%2$s\"." msgstr "Не удалось найти карту сети \"%1$s\" используемую на карте сети \"%2$s\"." -#: include/classes/import/CConfigurationImport.php:1235 +#: include/classes/import/CConfigurationImport.php:1234 #, c-format msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "Не удалось найти шаблон \"%1$s\" для прототипа узлов сети \"%2$s\" правила обнаружения \"%3$s\" на \"%4$s\"." @@ -2819,7 +2804,7 @@ msgstr "Не удалось найти триггер \"%1$s\" использу msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"." msgstr "Не удалось найти преобразование значений \"%1$s\" используемое в элементе данных \"%2$s\" на \"%3$s\"." -#: include/classes/import/CConfigurationImport.php:1122 +#: include/classes/import/CConfigurationImport.php:1121 #, c-format msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "Не удалось найти преобразование значений \"%1$s\" используемое в прототипу элементов данных \"%2$s\" в правиле обнаружения \"%3$s\" на \"%4$s\"." @@ -2847,7 +2832,7 @@ msgstr[0] "Не удалось импортировать шаблон \"%1$s\", msgstr[1] "Не удалось импортировать шаблон \"%1$s\", соединенные шаблоны \"%2$s\" не существуют." msgstr[2] "Не удалось импортировать шаблон \"%1$s\", соединенные шаблоны \"%2$s\" не существуют." -#: app/controllers/CControllerPopupTriggerExpr.php:1580 +#: app/controllers/CControllerPopupTriggerExpr.php:1581 msgid "Cannot insert trigger expression" msgstr "Не удалось вставить выражение триггера" @@ -2855,6 +2840,11 @@ msgstr "Не удалось вставить выражение триггера msgid "Cannot link template" msgstr "Не удалось присоединить шаблон" +#: include/classes/api/services/CHostBase.php:520 +#, c-format +msgid "Cannot link template \"%1$s\" to host \"%2$s\" because its parent template \"%3$s\" will be linked twice." +msgstr "" + #: include/classes/api/services/CHostBase.php:678 #: include/classes/api/services/CHostBase.php:755 #, c-format @@ -2866,10 +2856,10 @@ msgstr "Не удалось присоединить \"%1$s\" шаблон к у msgid "Cannot link template \"%1$s\" to host \"%2$s\" due to expression of trigger \"%3$s\"." msgstr "Не удалось присоединить \"%1$s\" шаблон к узлу сети \"%2$s\" из-за выражения триггера \"%3$s\"." -#: include/classes/api/services/CHostBase.php:520 +#: include/classes/api/services/CHostBase.php:517 #, c-format -msgid "Cannot link template \"%1$s\" to host \"%2$s\" due to its parent template \"%3$s\" will be linked twice." -msgstr "Не удалось присоединить \"%1$s\" шаблон к узлу сети \"%2$s\" из-за того, что родительский шаблон \"%3$s\" будет присоединён дважды." +msgid "Cannot link template \"%1$s\" to host prototype \"%2$s\" because its parent template \"%3$s\" will be linked twice." +msgstr "" #: include/classes/api/services/CHostBase.php:675 #: include/classes/api/services/CHostBase.php:752 @@ -2882,15 +2872,15 @@ msgstr "Не удалось присоединить \"%1$s\" шаблон к п msgid "Cannot link template \"%1$s\" to host prototype \"%2$s\" due to expression of trigger \"%3$s\"." msgstr "Не удалось присоединить \"%1$s\" шаблон к прототипу узлов сети \"%2$s\" из-за выражения триггера \"%3$s\"." -#: include/classes/api/services/CHostBase.php:517 +#: include/classes/api/services/CHostBase.php:381 #, c-format -msgid "Cannot link template \"%1$s\" to host prototype \"%2$s\" due to its parent template \"%3$s\" will be linked twice." -msgstr "Не удалось присоединить \"%1$s\" шаблон к прототипу узлов сети \"%2$s\" из-за того, что родительский шаблон \"%3$s\" будет присоединён дважды." +msgid "Cannot link template \"%1$s\" to template \"%2$s\" because circular linkage (%3$s) will occurs." +msgstr "" -#: include/classes/api/services/CHostBase.php:381 +#: include/classes/api/services/CHostBase.php:514 #, c-format -msgid "Cannot link template \"%1$s\" to template \"%2$s\" due to circular linkage (%3$s) will occurs." -msgstr "Не удалось присоединить \"%1$s\" шаблон к шаблону \"%2$s\" из-за возникновения цикличной связи (%3$s)." +msgid "Cannot link template \"%1$s\" to template \"%2$s\" because its parent template \"%3$s\" will be linked twice." +msgstr "" #: include/classes/api/services/CHostBase.php:672 #: include/classes/api/services/CHostBase.php:749 @@ -2903,11 +2893,6 @@ msgstr "Не удалось присоединить \"%1$s\" шаблон к ш msgid "Cannot link template \"%1$s\" to template \"%2$s\" due to expression of trigger \"%3$s\"." msgstr "Не удалось присоединить \"%1$s\" шаблон к шаблону \"%2$s\" из-за выражения триггера \"%3$s\"." -#: include/classes/api/services/CHostBase.php:514 -#, c-format -msgid "Cannot link template \"%1$s\" to template \"%2$s\" due to its parent template \"%3$s\" will be linked twice." -msgstr "Не удалось присоединить \"%1$s\" шаблон к шаблону \"%2$s\" из-за того, что родительский шаблон \"%3$s\" будет присоединён дважды." - #: include/classes/api/services/CHostBase.php:705 #, c-format msgid "Cannot link template \"%1$s\" without template \"%2$s\" to host \"%3$s\" due to dependency of trigger \"%4$s\"." @@ -2959,7 +2944,7 @@ msgstr "Невозможно массово обновить имя узла с msgid "Cannot mass update visible host name." msgstr "Невозможно массово обновить видимое имя узла сети." -#: include/classes/api/services/CHostBase.php:963 +#: include/classes/api/services/CHostBase.php:1080 #, c-format msgid "Cannot pass duplicate template IDs for the linkage: %1$s." msgstr "Невозможно передать дубликаты ID шаблонов для соединения: %1$s." @@ -3046,8 +3031,8 @@ msgid "Cannot set \"%1$s\" for item \"%2$s\"." msgstr "Не удалось установить \"%1$s\" для элемента данных \"%2$s\"." #: include/classes/api/services/CHost.php:1037 -#: include/classes/api/services/CHost.php:1997 -#: include/classes/api/services/CHost.php:2200 +#: include/classes/api/services/CHost.php:2015 +#: include/classes/api/services/CHost.php:2218 msgid "Cannot set inventory fields for disabled inventory." msgstr "Невозможно задать поля инвентарных данных при отключенной инвентаризации." @@ -3080,8 +3065,8 @@ msgstr[0] "Не удалось разблокировать пользовате msgstr[1] "Не удалось разблокировать пользователей" msgstr[2] "Не удалось разблокировать пользователей" -#: include/classes/api/services/CHostGeneral.php:846 -#: include/classes/api/services/CHostGeneral.php:1470 +#: include/classes/api/services/CHostGeneral.php:719 +#: include/classes/api/services/CHostGeneral.php:1356 msgid "Cannot unlink and clear Web scenarios." msgstr "Не удалось отсоединить и очистить веб-сценарии." @@ -3109,7 +3094,7 @@ msgstr "Не удалось отсоединить \"%1$s\" шаблон без msgid "Cannot unlink template \"%1$s\" without template \"%2$s\" from template \"%3$s\" due to expression of trigger \"%4$s\"." msgstr "Не удалось отсоединить \"%1$s\" шаблон без шаблона \"%2$s\" от шаблона \"%3$s\" из-за выражения триггера \"%4$s\"." -#: include/classes/api/services/CHostGeneral.php:1151 +#: include/classes/api/services/CHostGeneral.php:1037 #, c-format msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "Не удалось отсоединить триггер \"%1$s\", у него имеются элементы данных с шаблона, который остается присоединённым к узлу сети." @@ -3144,7 +3129,7 @@ msgstr "Не удалось обновить \"%1$s\" для шаблонног msgid "Cannot update \"%1$s\" for templated trigger prototype \"%2$s\"." msgstr "Не удалось обновить \"%1$s\" для шаблонного прототипа графика \"%2$s\"." -#: include/classes/api/services/CHost.php:2177 +#: include/classes/api/services/CHost.php:2195 #, c-format msgid "Cannot update \"%2$s\" for a discovered host \"%1$s\"." msgstr "Не удалось обновить \"%1$s\" у обнаруженного узла сети \"%2$s\"." @@ -3161,8 +3146,8 @@ msgstr "Не удалось обновить \"%1$s\" у обнаруженно msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"." msgstr "Не удалось обновить \"%2$s\" у обнаруженного триггера \"%1$s\"." -#: app/controllers/CControllerTokenUpdate.php:47 -#: app/controllers/CControllerTokenUpdate.php:122 +#: app/controllers/CControllerTokenUpdate.php:46 +#: app/controllers/CControllerTokenUpdate.php:115 msgid "Cannot update API token" msgstr "Не удалось обновить API токен" @@ -3170,7 +3155,7 @@ msgstr "Не удалось обновить API токен" msgid "Cannot update a discovered graph." msgstr "Невозможно обновить обнаруженный график." -#: include/classes/api/services/CHostGroup.php:792 +#: include/classes/api/services/CHostGroup.php:809 #, c-format msgid "Cannot update a discovered host group \"%1$s\"." msgstr "Не удалось обновить обнаруженную группу узлов сети \"%1$s\"." @@ -3184,7 +3169,7 @@ msgstr "Не удалось обновить унаследованный из msgid "Cannot update action" msgstr "Не удалось обновить действие" -#: app/controllers/CControllerAuthenticationUpdate.php:397 +#: app/controllers/CControllerAuthenticationUpdate.php:399 msgid "Cannot update authentication" msgstr "Не удалось обновить аутентификацию" @@ -3241,7 +3226,7 @@ msgstr "Не удалось обновить прототип графиков" msgid "Cannot update group" msgstr "Не удалось обновить группу" -#: include/classes/api/services/CHostGroup.php:1314 +#: include/classes/api/services/CHostGroup.php:1337 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Не удалось обновить группы для обнаруженного узла сети \"%1$s\"." @@ -3255,7 +3240,7 @@ msgstr "Не удалось обновить узел сети" msgid "Cannot update host encryption settings. Connection settings for both directions should be specified." msgstr "Не удалось обновить настройки шифрования узла сети. Необходимо указать настройки соединения в обе стороны." -#: host_prototypes.php:274 host_prototypes.php:304 host_prototypes.php:325 +#: host_prototypes.php:286 host_prototypes.php:320 host_prototypes.php:341 msgid "Cannot update host prototype" msgid_plural "Cannot update host prototypes" msgstr[0] "Не удалось обновить прототип узлов сети" @@ -3389,7 +3374,7 @@ msgstr "Не удалось обновить шаблоны" msgid "Cannot update trigger" msgstr "Не удалось обновить триггер" -#: include/classes/api/services/CTriggerGeneral.php:1886 +#: include/classes/api/services/CTriggerGeneral.php:1887 #, c-format msgid "Cannot update trigger \"%1$s\": %2$s." msgstr "Не удалось обновить триггер \"%1$s\": %2$s." @@ -3402,7 +3387,7 @@ msgstr[0] "Не удалось обновить прототип триггер msgstr[1] "Не удалось обновить прототипы триггеров" msgstr[2] "Не удалось обновить прототипы триггеров" -#: include/classes/api/services/CTriggerGeneral.php:1721 +#: include/classes/api/services/CTriggerGeneral.php:1722 #, c-format msgid "Cannot update trigger prototype \"%1$s\": %2$s." msgstr "Не удалось обновить прототип триггера \"%1$s\": %2$s." @@ -3446,7 +3431,7 @@ msgstr "Регистрозависимое" msgid "Case-sensitive login" msgstr "Регистрозависимый вход" -#: include/locales.inc.php:48 +#: include/locales.inc.php:35 msgid "Catalan (ca_ES)" msgstr "Каталонский (ca_ES)" @@ -3541,9 +3526,9 @@ msgstr "Строка символов включена" msgid "Character string not included" msgstr "Строка символов не включена" -#: app/controllers/CControllerPopupTriggerExpr.php:759 -#: app/controllers/CControllerPopupTriggerExpr.php:952 -#: app/controllers/CControllerPopupTriggerExpr.php:1140 +#: app/controllers/CControllerPopupTriggerExpr.php:760 +#: app/controllers/CControllerPopupTriggerExpr.php:953 +#: app/controllers/CControllerPopupTriggerExpr.php:1141 msgid "Chars" msgstr "Символы" @@ -3581,7 +3566,7 @@ msgid "Check for not supported value" msgstr "Проверка на неподдерживамое значение" #: include/classes/setup/CSetupWizard.php:58 -#: include/classes/setup/CSetupWizard.php:463 +#: include/classes/setup/CSetupWizard.php:465 msgid "Check of pre-requisites" msgstr "Проверка предварительных условий" @@ -3648,11 +3633,11 @@ msgstr "Проверки должны быть уникальными." msgid "Child services" msgstr "Дочерние услуги" -#: include/locales.inc.php:49 +#: include/locales.inc.php:36 msgid "Chinese (zh_CN)" msgstr "Китайский (zh_CN)" -#: include/locales.inc.php:50 +#: include/locales.inc.php:37 msgid "Chinese (zh_TW)" msgstr "Китайский (zh_TW)" @@ -3661,7 +3646,7 @@ msgstr "Китайский (zh_TW)" msgid "Circular reference in templates: %1$s." msgstr "Закольцованная ссылка в шаблонах: %1$s." -#: include/classes/api/services/CHostBase.php:1157 +#: include/classes/api/services/CHostBase.php:1286 msgid "Circular template linkage is not allowed." msgstr "Закольцованное соединение шаблонов не допускается." @@ -3725,10 +3710,8 @@ msgstr "Часы" msgid "Clone" msgstr "Клонировать" -#: app/views/administration.token.view.php:64 -#: app/views/administration.user.token.view.php:63 -#: app/views/popup.import.compare.php:162 include/func.inc.php:1723 -#: include/views/js/monitoring.sysmaps.js.php:333 +#: app/views/popup.import.compare.php:162 app/views/popup.token.view.php:86 +#: include/func.inc.php:1723 include/views/js/monitoring.sysmaps.js.php:333 #: include/views/js/monitoring.sysmaps.js.php:486 #: include/views/js/monitoring.sysmaps.js.php:610 #: include/views/js/monitoring.sysmaps.js.php:715 @@ -3852,28 +3835,28 @@ msgstr "Сжатие" msgid "Concurrent sessions" msgstr "Одновременные сессии" -#: app/controllers/CControllerPopupTriggerExpr.php:1603 +#: app/controllers/CControllerPopupTriggerExpr.php:1604 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195 #: app/views/popup.service.statusrule.edit.php:49 msgid "Condition" msgstr "Условие" -#: include/classes/api/services/CDiscoveryRule.php:1810 +#: include/classes/api/services/CDiscoveryRule.php:1813 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1602 +#: include/classes/api/services/CDiscoveryRule.php:1605 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"." msgstr "Условие \"%2$s\" не используется в \"%3$s\" формуле замещением \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1809 +#: include/classes/api/services/CDiscoveryRule.php:1812 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" правила обнаружения \"%1$s\" не определено." -#: include/classes/api/services/CDiscoveryRule.php:1601 +#: include/classes/api/services/CDiscoveryRule.php:1604 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined." msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" замещением \"%1$s\" не задано." @@ -3897,7 +3880,7 @@ msgstr "Настройка" msgid "Configuration cache statistics. Cache - buffer (modes: pfree, total, used, free)." msgstr "Статистика конфигурационного кэша. Кэш - буфер (режимы: pfree, total, used, free)." -#: include/classes/setup/CSetupWizard.php:907 +#: include/classes/setup/CSetupWizard.php:909 #, c-format msgid "Configuration file \"%1$s\" created." msgstr "Файл конфигурации \"%1$s\" создан." @@ -4052,7 +4035,7 @@ msgid "Configuration updated" msgstr "Настройки обновлены" #: include/classes/setup/CSetupWizard.php:62 -#: include/classes/setup/CSetupWizard.php:599 +#: include/classes/setup/CSetupWizard.php:601 msgid "Configure DB connection" msgstr "Настройка подключения к БД" @@ -4060,7 +4043,7 @@ msgstr "Настройка подключения к БД" msgid "Confirmation text" msgstr "Текст подтверждения" -#: include/classes/setup/CSetupWizard.php:905 +#: include/classes/setup/CSetupWizard.php:907 msgid "Congratulations! You have successfully installed Zabbix frontend." msgstr "Поздравляем! Вы успешно установили Zabbix веб-интерфейс." @@ -4131,7 +4114,7 @@ msgstr "" msgid "Connection to Zabbix server failed. Incorrect configuration." msgstr "Неудачное подключение к Zabbix серверу. Проверьте настройки." -#: include/classes/setup/CSetupWizard.php:550 +#: include/classes/setup/CSetupWizard.php:552 msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)." msgstr "Подключение не будет зашифровано так как используется сокет файл (на Unix) или разделяемая память (Windows)." @@ -4192,11 +4175,11 @@ msgstr "Содержит" #: app/views/administration.proxy.list.php:39 #: app/views/administration.regex.list.php:40 #: app/views/administration.script.list.php:36 -#: app/views/administration.token.list.php:108 +#: app/views/administration.token.list.php:107 #: app/views/administration.usergroup.list.php:37 #: app/views/administration.user.list.php:54 #: app/views/administration.userrole.list.php:37 -#: app/views/administration.user.token.list.php:74 +#: app/views/administration.user.token.list.php:73 #: app/views/configuration.correlation.list.php:41 #: app/views/configuration.dashboard.edit.php:71 #: app/views/configuration.dashboard.list.php:81 @@ -4276,8 +4259,7 @@ msgstr "Координаты" msgid "Copy" msgstr "Копировать" -#: app/views/administration.token.view.php:45 -#: app/views/administration.user.token.view.php:44 +#: app/views/popup.token.view.php:54 msgid "Copy to clipboard" msgstr "Копировать в буфер обмена" @@ -4325,8 +4307,8 @@ msgstr "Корреляция обновлена" #: app/controllers/CControllerPopupTriggerExpr.php:52 #: app/controllers/CControllerPopupTriggerExpr.php:705 -#: app/controllers/CControllerPopupTriggerExpr.php:895 -#: app/controllers/CControllerPopupTriggerExpr.php:926 +#: app/controllers/CControllerPopupTriggerExpr.php:896 +#: app/controllers/CControllerPopupTriggerExpr.php:927 msgid "Count" msgstr "Количество" @@ -4587,8 +4569,8 @@ msgid "Create web scenario (select template first)" msgstr "Создать веб-сценарий (выберите сначала шаблон)" #: app/partials/service.list.edit.php:57 app/partials/service.list.php:54 -#: app/views/administration.token.list.php:137 -#: app/views/administration.user.token.list.php:98 +#: app/views/administration.token.list.php:136 +#: app/views/administration.user.token.list.php:97 #: app/views/popup.service.edit.php:146 msgid "Created at" msgstr "Создано в" @@ -4598,11 +4580,11 @@ msgstr "Создано в" msgid "Created by me" msgstr "Созданы мной" -#: app/views/administration.token.list.php:138 +#: app/views/administration.token.list.php:137 msgid "Created by user" msgstr "Создано пользователем" -#: app/views/administration.token.list.php:74 +#: app/views/administration.token.list.php:73 msgid "Created by users" msgstr "Создано пользователями" @@ -4619,7 +4601,7 @@ msgstr "Текущий узел сети" msgid "Current user" msgstr "Текущий пользователь" -#: include/classes/setup/CSetupWizard.php:421 +#: include/classes/setup/CSetupWizard.php:423 msgid "Current value" msgstr "Текущее значение" @@ -4668,8 +4650,8 @@ msgstr "Пользовательское сообщение" msgid "Custom multiplier" msgstr "Пользовательский множитель" -#: app/views/js/popup.itemtestedit.view.js.php:381 include/forms.inc.php:1226 -#: include/forms.inc.php:1466 include/views/js/item.preprocessing.js.php:64 +#: app/views/js/popup.itemtestedit.view.js.php:381 include/forms.inc.php:1262 +#: include/forms.inc.php:1502 include/views/js/item.preprocessing.js.php:64 msgid "Custom on fail" msgstr "Другое при ошибке" @@ -4693,7 +4675,7 @@ msgstr "Пользовательский размер" msgid "Cycle" msgstr "Периодичность" -#: include/locales.inc.php:51 +#: include/locales.inc.php:38 msgid "Czech (cs_CZ)" msgstr "Чешский (cs_CZ)" @@ -4851,16 +4833,16 @@ msgstr "Набор данных" msgid "Data storage period" msgstr "Период хранения данных" -#: include/classes/setup/CSetupWizard.php:563 -#: include/classes/setup/CSetupWizard.php:715 -#: include/classes/setup/CSetupWizard.php:974 +#: include/classes/setup/CSetupWizard.php:565 +#: include/classes/setup/CSetupWizard.php:717 +#: include/classes/setup/CSetupWizard.php:976 msgid "Database TLS CA file" msgstr "Файл TLS CA базы данных" #: include/classes/setup/CFrontendSetup.php:668 -#: include/classes/setup/CSetupWizard.php:573 -#: include/classes/setup/CSetupWizard.php:723 -#: include/classes/setup/CSetupWizard.php:982 +#: include/classes/setup/CSetupWizard.php:575 +#: include/classes/setup/CSetupWizard.php:725 +#: include/classes/setup/CSetupWizard.php:984 msgid "Database TLS certificate file" msgstr "Файл TLS сертификата базы данных" @@ -4868,19 +4850,19 @@ msgstr "Файл TLS сертификата базы данных" msgid "Database TLS certificate files must be read-only" msgstr "Файлы TLS сертификатов базы данных должны быть только на чтение" -#: include/classes/setup/CSetupWizard.php:583 -#: include/classes/setup/CSetupWizard.php:733 +#: include/classes/setup/CSetupWizard.php:585 +#: include/classes/setup/CSetupWizard.php:735 msgid "Database TLS cipher list" msgstr "Список TLS шифров базы данных" -#: include/classes/setup/CSetupWizard.php:546 -#: include/classes/setup/CSetupWizard.php:708 +#: include/classes/setup/CSetupWizard.php:548 +#: include/classes/setup/CSetupWizard.php:710 msgid "Database TLS encryption" msgstr "TLS шифрование базы данных" -#: include/classes/setup/CSetupWizard.php:568 -#: include/classes/setup/CSetupWizard.php:719 -#: include/classes/setup/CSetupWizard.php:978 +#: include/classes/setup/CSetupWizard.php:570 +#: include/classes/setup/CSetupWizard.php:721 +#: include/classes/setup/CSetupWizard.php:980 msgid "Database TLS key file" msgstr "Файл TLS ключа базы данных" @@ -4892,12 +4874,12 @@ msgstr "Таблицы истории базы данных обновлены" msgid "Database history tables use primary key" msgstr "Таблицы истории базы данных используют первичный ключ" -#: include/classes/setup/CSetupWizard.php:484 +#: include/classes/setup/CSetupWizard.php:486 msgid "Database host" msgstr "Хост базы данных" -#: include/classes/setup/CSetupWizard.php:578 -#: include/classes/setup/CSetupWizard.php:727 +#: include/classes/setup/CSetupWizard.php:580 +#: include/classes/setup/CSetupWizard.php:729 msgid "Database host verification" msgstr "Сверка хоста базы данных" @@ -4905,35 +4887,35 @@ msgstr "Сверка хоста базы данных" msgid "Database monitor" msgstr "Монитор баз данных" -#: include/classes/setup/CSetupWizard.php:494 -#: include/classes/setup/CSetupWizard.php:672 setup.php:45 +#: include/classes/setup/CSetupWizard.php:496 +#: include/classes/setup/CSetupWizard.php:674 setup.php:45 msgid "Database name" msgstr "Имя базы данных" -#: include/classes/setup/CSetupWizard.php:680 +#: include/classes/setup/CSetupWizard.php:682 msgid "Database password" msgstr "Пароль от базы данных" -#: include/classes/setup/CSetupWizard.php:488 -#: include/classes/setup/CSetupWizard.php:668 setup.php:44 +#: include/classes/setup/CSetupWizard.php:490 +#: include/classes/setup/CSetupWizard.php:670 setup.php:44 msgid "Database port" msgstr "Порт базы данных" -#: include/classes/setup/CSetupWizard.php:498 -#: include/classes/setup/CSetupWizard.php:686 +#: include/classes/setup/CSetupWizard.php:500 +#: include/classes/setup/CSetupWizard.php:688 msgid "Database schema" msgstr "Схема базы данных" -#: include/classes/setup/CSetupWizard.php:664 +#: include/classes/setup/CSetupWizard.php:666 msgid "Database server" msgstr "Сервер базы данных" -#: include/classes/setup/CSetupWizard.php:477 -#: include/classes/setup/CSetupWizard.php:647 +#: include/classes/setup/CSetupWizard.php:479 +#: include/classes/setup/CSetupWizard.php:649 msgid "Database type" msgstr "Тип базы данных" -#: include/classes/setup/CSetupWizard.php:676 +#: include/classes/setup/CSetupWizard.php:678 msgid "Database user" msgstr "Имя пользователя от базы данных" @@ -5009,8 +4991,8 @@ msgstr "Дек." msgid "December" msgstr "Декабрь" -#: app/controllers/CControllerPopupTriggerExpr.php:939 -#: app/controllers/CControllerPopupTriggerExpr.php:1153 +#: app/controllers/CControllerPopupTriggerExpr.php:940 +#: app/controllers/CControllerPopupTriggerExpr.php:1154 #: include/classes/widgets/forms/CWidgetFormItem.php:150 msgid "Decimal places" msgstr "Число десятичных знаков" @@ -5054,8 +5036,8 @@ msgstr "Аутентификация по умолчанию" msgid "Default host inventory mode" msgstr "Режим инвентаризации узлов сети по умолчанию" -#: app/views/administration.gui.edit.php:70 -#: include/classes/setup/CSetupWizard.php:411 +#: app/views/administration.gui.edit.php:72 +#: include/classes/setup/CSetupWizard.php:413 msgid "Default language" msgstr "Язык по умолчанию" @@ -5075,13 +5057,13 @@ msgstr "Длительность шага операции по умолчани msgid "Default page display period" msgstr "Период отображения страницы по умолчанию" -#: app/views/administration.gui.edit.php:82 -#: include/classes/setup/CSetupWizard.php:626 +#: app/views/administration.gui.edit.php:84 +#: include/classes/setup/CSetupWizard.php:628 msgid "Default theme" msgstr "Тема по умолчанию" -#: app/views/administration.gui.edit.php:75 -#: include/classes/setup/CSetupWizard.php:619 +#: app/views/administration.gui.edit.php:77 +#: include/classes/setup/CSetupWizard.php:621 msgid "Default time zone" msgstr "Часовой пояс по умолчанию" @@ -5108,16 +5090,14 @@ msgstr "Задерживается на" #: app/views/administration.regex.list.php:81 #: app/views/administration.script.edit.php:284 #: app/views/administration.script.list.php:202 -#: app/views/administration.token.edit.php:110 -#: app/views/administration.token.list.php:201 -#: app/views/administration.user.edit.php:758 +#: app/views/administration.token.list.php:200 +#: app/views/administration.user.edit.php:760 #: app/views/administration.usergroup.edit.php:222 #: app/views/administration.usergroup.list.php:237 #: app/views/administration.user.list.php:250 #: app/views/administration.userrole.edit.php:362 #: app/views/administration.userrole.list.php:127 -#: app/views/administration.user.token.edit.php:92 -#: app/views/administration.user.token.list.php:153 +#: app/views/administration.user.token.list.php:152 #: app/views/configuration.correlation.edit.php:182 #: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 @@ -5128,6 +5108,7 @@ msgstr "Задерживается на" #: app/views/monitoring.dashboard.list.php:123 #: app/views/popup.host.edit.php:82 app/views/popup.service.edit.php:390 #: app/views/popup.sla.edit.php:273 app/views/popup.tabfilter.edit.php:71 +#: app/views/popup.token.edit.php:140 #: app/views/reports.scheduledreport.list.php:94 app/views/sla.list.php:175 #: include/classes/html/CButtonDelete.php:25 #: include/classes/widgets/CWidgetHelper.php:845 @@ -5246,16 +5227,10 @@ msgstr "Удалить регулярное выражение?" msgid "Delete script?" msgstr "Удалить скрипт?" -#: app/views/administration.token.edit.php:115 -#: app/views/administration.user.token.edit.php:97 +#: app/views/popup.token.edit.php:141 msgid "Delete selected API token?" msgstr "Удалить выбранный API токен?" -#: app/views/administration.token.list.php:201 -#: app/views/administration.user.token.list.php:153 -msgid "Delete selected API tokens?" -msgstr "Удалить выбранные API токены?" - #: app/views/js/sla.list.js.php:130 app/views/popup.sla.edit.php:274 msgid "Delete selected SLA?" msgstr "Удалить выбранный SLA?" @@ -5395,6 +5370,16 @@ msgstr "Удалить выбранные фигуры?" msgid "Delete selected templates?" msgstr "Удалить выбранные шаблоны?" +#: app/views/js/administration.token.list.js.php:78 +#: app/views/js/administration.user.token.list.js.php:78 +msgid "Delete selected token?" +msgstr "" + +#: app/views/js/administration.token.list.js.php:77 +#: app/views/js/administration.user.token.list.js.php:77 +msgid "Delete selected tokens?" +msgstr "" + #: include/views/configuration.trigger.prototype.list.php:214 msgid "Delete selected trigger prototypes?" msgstr "Удалить выбранные прототипы триггеров?" @@ -5403,7 +5388,7 @@ msgstr "Удалить выбранные прототипы триггеров? msgid "Delete selected triggers?" msgstr "Удалить выбранные триггеры?" -#: app/views/administration.user.edit.php:760 +#: app/views/administration.user.edit.php:762 msgid "Delete selected user?" msgstr "Удалить выбранного пользователя?" @@ -5435,21 +5420,11 @@ msgstr "Удалить веб-сценарий?" msgid "Deleted" msgstr "Удалено" -#: include/classes/api/services/CHost.php:1494 -#, c-format -msgid "Deleted: Host \"%1$s\"." -msgstr "Удалено: Узел сети \"%1$s\"." - -#: include/classes/api/services/CHostPrototype.php:1185 -#, c-format -msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"." -msgstr "Удалено: Прототип узлов сети \"%1$s\" из \"%2$s\"." - #: app/views/administration.regex.edit.php:49 msgid "Delimiter" msgstr "Разделитель" -#: app/views/administration.user.edit.php:617 +#: app/views/administration.user.edit.php:619 msgid "Denied methods" msgstr "Запрещенные методы" @@ -5471,7 +5446,7 @@ msgstr "Список запретов" msgid "Dependencies" msgstr "Зависимости" -#: include/triggers.inc.php:2402 +#: include/triggers.inc.php:2399 msgid "Dependent" msgstr "Зависимость" @@ -5479,7 +5454,7 @@ msgstr "Зависимость" msgid "Dependent item" msgstr "Зависимый элемент данных" -#: app/views/popup.generic.php:279 include/triggers.inc.php:2402 +#: app/views/popup.generic.php:279 include/triggers.inc.php:2399 #: include/views/configuration.trigger.prototype.list.php:94 #: include/views/configuration.triggers.list.php:238 msgid "Depends on" @@ -5504,15 +5479,12 @@ msgstr "" #: app/views/administration.module.list.php:77 #: app/views/administration.proxy.edit.php:84 #: app/views/administration.script.edit.php:202 -#: app/views/administration.token.edit.php:69 -#: app/views/administration.token.view.php:55 -#: app/views/administration.user.token.edit.php:51 -#: app/views/administration.user.token.view.php:54 #: app/views/configuration.correlation.edit.php:137 #: app/views/popup.massupdate.host.php:111 #: app/views/popup.massupdate.item.php:465 #: app/views/popup.massupdate.template.php:114 #: app/views/popup.service.edit.php:136 app/views/popup.sla.edit.php:167 +#: app/views/popup.token.edit.php:84 app/views/popup.token.view.php:69 #: include/classes/widgets/forms/CWidgetFormItem.php:78 #: include/classes/widgets/views/widget.item.form.view.php:50 #: include/events.inc.php:264 @@ -5545,11 +5517,11 @@ msgstr "Детали" msgid "Details of web scenario" msgstr "Подробности о веб-сценарии" -#: app/controllers/CControllerPopupTriggerExpr.php:1100 +#: app/controllers/CControllerPopupTriggerExpr.php:1101 msgid "Detection period" msgstr "Период обнаружения" -#: app/controllers/CControllerPopupTriggerExpr.php:1110 +#: app/controllers/CControllerPopupTriggerExpr.php:1111 msgid "Deviations" msgstr "Отклонения" @@ -5579,9 +5551,9 @@ msgstr "Размер директории (в байтах). Возвращае #: app/views/administration.mediatype.list.php:181 #: app/views/administration.module.list.php:124 -#: app/views/administration.token.list.php:200 +#: app/views/administration.token.list.php:198 #: app/views/administration.usergroup.list.php:219 -#: app/views/administration.user.token.list.php:152 +#: app/views/administration.user.token.list.php:150 #: app/views/configuration.correlation.list.php:148 #: app/views/configuration.discovery.list.php:121 #: app/views/configuration.host.list.php:505 @@ -5623,8 +5595,8 @@ msgstr "Деактивировать узлы сети в выбранных г msgid "Disable hosts monitored by selected proxies?" msgstr "Деактивировать узлы сети наблюдаемые выбранными прокси?" -#: app/views/administration.token.list.php:200 -#: app/views/administration.user.token.list.php:152 +#: app/views/administration.token.list.php:198 +#: app/views/administration.user.token.list.php:150 msgid "Disable selected API tokens?" msgstr "Деактивировать выбранные API токены?" @@ -5692,10 +5664,10 @@ msgstr "Деактивировать выбранные веб-сценарии? #: app/views/administration.miscconfig.edit.php:59 #: app/views/administration.module.list.php:54 #: app/views/administration.module.list.php:101 -#: app/views/administration.token.list.php:95 -#: app/views/administration.token.list.php:183 -#: app/views/administration.user.edit.php:304 -#: app/views/administration.user.edit.php:598 +#: app/views/administration.token.list.php:94 +#: app/views/administration.token.list.php:181 +#: app/views/administration.user.edit.php:306 +#: app/views/administration.user.edit.php:600 #: app/views/administration.usergroup.list.php:54 #: app/views/administration.usergroup.list.php:92 #: app/views/administration.usergroup.list.php:130 @@ -5703,8 +5675,8 @@ msgstr "Деактивировать выбранные веб-сценарии? #: app/views/administration.user.list.php:203 #: app/views/administration.user.list.php:237 #: app/views/administration.user.list.php:239 -#: app/views/administration.user.token.list.php:61 -#: app/views/administration.user.token.list.php:135 +#: app/views/administration.user.token.list.php:60 +#: app/views/administration.user.token.list.php:133 #: app/views/configuration.correlation.list.php:57 #: app/views/configuration.correlation.list.php:108 #: app/views/configuration.discovery.list.php:57 @@ -5718,7 +5690,7 @@ msgstr "Деактивировать выбранные веб-сценарии? #: include/html.inc.php:284 include/httptest.inc.php:48 #: include/items.inc.php:138 include/items.inc.php:141 #: include/items.inc.php:185 include/maps.inc.php:325 -#: include/triggers.inc.php:1875 include/users.inc.php:84 +#: include/triggers.inc.php:1872 include/users.inc.php:84 #: include/views/configuration.action.list.php:81 #: include/views/configuration.action.list.php:133 #: include/views/configuration.host.discovery.list.php:167 @@ -5739,7 +5711,7 @@ msgstr "Отбрасывать не изменившееся" msgid "Discard unchanged with heartbeat" msgstr "Отбрасывать не изменившееся с периодическим контролем" -#: app/views/js/popup.itemtestedit.view.js.php:359 include/forms.inc.php:1445 +#: app/views/js/popup.itemtestedit.view.js.php:359 include/forms.inc.php:1481 #: include/views/js/item.preprocessing.js.php:66 msgid "Discard value" msgstr "Отбросить значение" @@ -5757,7 +5729,7 @@ msgid "Discover" msgstr "Обнаружение" #: app/partials/configuration.filter.items.php:207 -#: include/discovery.inc.php:138 include/forms.inc.php:350 +#: include/discovery.inc.php:138 include/forms.inc.php:374 #: include/views/configuration.triggers.list.php:121 msgid "Discovered" msgstr "Обнаружен" @@ -5781,7 +5753,7 @@ msgstr "Обнаруженное устройство" #: include/classes/helpers/CMenuHelper.php:62 #: include/classes/helpers/CMenuHelper.php:227 #: include/classes/helpers/CRoleHelper.php:344 -#: include/classes/helpers/CRoleHelper.php:413 include/forms.inc.php:537 +#: include/classes/helpers/CRoleHelper.php:413 include/forms.inc.php:573 #: include/views/configuration.template.list.php:124 #: include/views/configuration.template.list.php:245 #: include/views/inventory.host.view.php:198 @@ -5851,7 +5823,7 @@ msgstr "Обнаружение виртуальных машин VMware, <url> - #: app/views/configuration.discovery.edit.php:136 #: app/views/monitoring.discovery.view.php:49 #: app/views/monitoring.widget.discovery.view.php:32 -#: include/actions.inc.php:52 include/forms.inc.php:894 +#: include/actions.inc.php:52 include/forms.inc.php:930 msgid "Discovery rule" msgstr "Правило обнаружения" @@ -5873,7 +5845,7 @@ msgstr "Правило обнаружения \"%1$s\" уже существуе msgid "Discovery rule \"%1$s\" already exists." msgstr "Правило обнаружения \"%1$s\" уже существует." -#: include/classes/api/services/CDiscoveryRule.php:2162 +#: include/classes/api/services/CDiscoveryRule.php:2165 #, c-format msgid "Discovery rule \"%1$s\" cannot be copied without its master item." msgstr "Правило обнаружения \"%1$s\" нельзя скопировать без его мастер элемента данных." @@ -5953,7 +5925,7 @@ msgstr "" msgid "Display OK triggers for" msgstr "Отображать триггеры в состоянии ОК в течении" -#: app/partials/monitoring.latest.view.html.php:279 +#: app/partials/monitoring.latest.view.html.php:283 msgid "Display graph" msgstr "Показать график" @@ -5961,7 +5933,7 @@ msgstr "Показать график" msgid "Display problems" msgstr "Отображение проблем" -#: app/partials/monitoring.latest.view.html.php:278 +#: app/partials/monitoring.latest.view.html.php:282 msgid "Display stacked graph" msgstr "Показать стэкируемый график" @@ -5985,7 +5957,7 @@ msgstr "Отображено с %1$s до %2$s из %3$s найденных" msgid "Displaying options" msgstr "Опции отображения" -#: app/controllers/CControllerPopupTriggerExpr.php:811 +#: app/controllers/CControllerPopupTriggerExpr.php:812 msgid "Division denominator" msgstr "Знаменатель деления" @@ -6069,7 +6041,7 @@ msgstr "Недоступен" msgid "Download image" msgstr "Загрузить изображение" -#: include/classes/setup/CSetupWizard.php:882 +#: include/classes/setup/CSetupWizard.php:884 msgid "Download the configuration file" msgstr "Загрузить конфигурационный файл" @@ -6115,14 +6087,14 @@ msgstr "Дублирующиеся зависимости в триггере \" msgid "Duplicate dependencies in trigger prototype \"%1$s\"." msgstr "Дубликат зависимостей в прототипе триггеров \"%1$s\"." -#: include/classes/api/services/CHost.php:1932 -#: include/classes/api/services/CHost.php:2229 +#: include/classes/api/services/CHost.php:1950 +#: include/classes/api/services/CHost.php:2247 #, c-format msgid "Duplicate host. Host with the same host name \"%1$s\" already exists in data." msgstr "Дубликат узла сети. Узел сети с таким же именем узла сети \"%1$s\" уже существует в данных." -#: include/classes/api/services/CHost.php:1939 -#: include/classes/api/services/CHost.php:2249 +#: include/classes/api/services/CHost.php:1957 +#: include/classes/api/services/CHost.php:2267 #, c-format msgid "Duplicate host. Host with the same visible name \"%1$s\" already exists in data." msgstr "Дубликат узла сети. Узел сети с таким же видимым именем узла сети \"%1$s\" уже существует в данных." @@ -6144,7 +6116,7 @@ msgstr "Дубликат userid \"%1$s\" в пользователях у кар msgid "Duration" msgstr "Длительность" -#: include/locales.inc.php:52 +#: include/locales.inc.php:39 msgid "Dutch (nl_NL)" msgstr "Голландский (nl_NL)" @@ -6168,7 +6140,7 @@ msgid "Each item" msgstr "Каждый элемент данных" #: app/partials/service.list.edit.php:126 -#: app/views/administration.user.edit.php:353 +#: app/views/administration.user.edit.php:355 #: app/views/js/administration.mediatype.edit.js.php:50 #: app/views/js/configuration.discovery.edit.js.php:33 #: app/views/js/popup.service.edit.js.php:194 @@ -6267,25 +6239,23 @@ msgstr "Пустой файл SSL ключа у веб-сценария \"%1$s\" msgid "Empty color." msgstr "Пустой цвет." -#: include/classes/api/services/CDiscoveryRule.php:1837 +#: include/classes/api/services/CDiscoveryRule.php:1840 #, c-format msgid "Empty filter condition formula ID for discovery rule \"%1$s\"." msgstr "Пустой ID формулы условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1829 +#: include/classes/api/services/CDiscoveryRule.php:1832 #, c-format msgid "Empty filter condition macro for discovery rule \"%1$s\"." msgstr "Пустой макрос условия фильтра для правила обнаружения \"%1$s\"." #: include/classes/api/services/CDRule.php:194 #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CHostGeneral.php:1034 +#: include/classes/api/services/CHostGeneral.php:917 #: include/classes/api/services/CHostInterface.php:584 #: include/classes/api/services/CHostInterface.php:628 -#: include/classes/api/services/CHost.php:1319 -#: include/classes/api/services/CHost.php:1850 -#: include/classes/api/services/CHost.php:2075 -#: include/classes/api/services/CHostPrototype.php:1113 +#: include/classes/api/services/CHost.php:1868 +#: include/classes/api/services/CHost.php:2093 #: include/classes/api/services/CMap.php:563 #: include/classes/api/services/CMap.php:589 #: include/classes/api/services/CMap.php:1034 @@ -6299,9 +6269,9 @@ msgstr "Пустой ID карты сети." #: app/views/administration.mediatype.list.php:180 #: app/views/administration.module.list.php:123 -#: app/views/administration.token.list.php:199 +#: app/views/administration.token.list.php:197 #: app/views/administration.usergroup.list.php:213 -#: app/views/administration.user.token.list.php:151 +#: app/views/administration.user.token.list.php:149 #: app/views/configuration.correlation.list.php:147 #: app/views/configuration.discovery.list.php:120 #: app/views/configuration.host.list.php:498 @@ -6372,8 +6342,8 @@ msgstr "Активировать узлы сети наблюдаемые выб msgid "Enable internal housekeeping" msgstr "Активировать внутреннюю очистку истории" -#: app/views/administration.token.list.php:199 -#: app/views/administration.user.token.list.php:151 +#: app/views/administration.token.list.php:197 +#: app/views/administration.user.token.list.php:149 msgid "Enable selected API tokens?" msgstr "Активировать выбранные API токены?" @@ -6451,12 +6421,10 @@ msgstr "Активировать трапы" #: app/views/administration.module.edit.php:45 #: app/views/administration.module.list.php:53 #: app/views/administration.module.list.php:95 -#: app/views/administration.token.edit.php:88 -#: app/views/administration.token.list.php:94 -#: app/views/administration.token.list.php:174 -#: app/views/administration.token.view.php:56 -#: app/views/administration.user.edit.php:298 -#: app/views/administration.user.edit.php:598 +#: app/views/administration.token.list.php:93 +#: app/views/administration.token.list.php:172 +#: app/views/administration.user.edit.php:300 +#: app/views/administration.user.edit.php:600 #: app/views/administration.usergroup.edit.php:79 #: app/views/administration.usergroup.edit.php:91 #: app/views/administration.usergroup.edit.php:92 @@ -6468,10 +6436,8 @@ msgstr "Активировать трапы" #: app/views/administration.user.list.php:236 #: app/views/administration.user.list.php:240 #: app/views/administration.userrole.edit.php:275 -#: app/views/administration.user.token.edit.php:70 -#: app/views/administration.user.token.list.php:60 -#: app/views/administration.user.token.list.php:126 -#: app/views/administration.user.token.view.php:55 +#: app/views/administration.user.token.list.php:59 +#: app/views/administration.user.token.list.php:124 #: app/views/configuration.correlation.edit.php:160 #: app/views/configuration.correlation.list.php:56 #: app/views/configuration.correlation.list.php:119 @@ -6479,13 +6445,14 @@ msgstr "Активировать трапы" #: app/views/configuration.discovery.list.php:56 #: app/views/configuration.host.list.php:274 app/views/popup.generic.php:645 #: app/views/popup.massupdate.host.php:139 app/views/popup.media.php:89 -#: app/views/popup.sla.edit.php:175 +#: app/views/popup.sla.edit.php:175 app/views/popup.token.edit.php:112 +#: app/views/popup.token.view.php:73 #: app/views/reports.scheduledreport.list.php:61 app/views/sla.list.php:52 #: app/views/sla.list.php:102 app/views/sla.list.php:115 #: include/discovery.inc.php:107 include/html.inc.php:280 #: include/httptest.inc.php:47 include/items.inc.php:138 #: include/items.inc.php:141 include/items.inc.php:182 -#: include/triggers.inc.php:999 include/triggers.inc.php:1872 +#: include/triggers.inc.php:996 include/triggers.inc.php:1869 #: include/views/configuration.action.edit.php:151 #: include/views/configuration.action.list.php:80 #: include/views/configuration.action.list.php:141 @@ -6521,13 +6488,13 @@ msgstr "Дата окончания" msgid "End of line sequence" msgstr "Конец строки" -#: include/locales.inc.php:46 +#: include/locales.inc.php:33 msgid "English (en_US)" msgstr "Английский (en_US)" #: include/classes/api/services/CGraphGeneral.php:646 -#: include/classes/api/services/CHostGroup.php:772 -#: include/classes/api/services/CHostPrototype.php:344 +#: include/classes/api/services/CHostGroup.php:789 +#: include/classes/api/services/CHostPrototype.php:1073 #: include/classes/api/services/CHttpTest.php:390 #: include/classes/api/services/CItemGeneral.php:634 #: include/classes/api/services/CService.php:1386 @@ -6590,7 +6557,7 @@ msgstr "Ошибка! Zabbix сервер не может стартовать msgid "Error: %1$s" msgstr "Ошибка: %1$s" -#: app/controllers/CControllerPopupTriggerExpr.php:1090 +#: app/controllers/CControllerPopupTriggerExpr.php:1091 msgid "Evaluation period" msgstr "Период анализа" @@ -6623,7 +6590,7 @@ msgstr "Правила корреляции событий" msgid "Event details" msgstr "Детали события" -#: include/triggers.inc.php:989 +#: include/triggers.inc.php:986 msgid "Event generation" msgstr "Генерация события" @@ -6803,17 +6770,14 @@ msgstr "Завершено" msgid "Expired on %1$s." msgstr "Истекает в %1$s." -#: app/views/administration.token.edit.php:81 -#: app/views/administration.token.list.php:132 -#: app/views/administration.token.view.php:49 -#: app/views/administration.user.token.edit.php:63 -#: app/views/administration.user.token.list.php:93 -#: app/views/administration.user.token.view.php:48 +#: app/views/administration.token.list.php:131 +#: app/views/administration.user.token.list.php:92 +#: app/views/popup.token.edit.php:102 app/views/popup.token.view.php:60 msgid "Expires at" msgstr "Истекает в" -#: app/views/administration.token.list.php:61 -#: app/views/administration.user.token.list.php:44 +#: app/views/administration.token.list.php:59 +#: app/views/administration.user.token.list.php:42 msgid "Expires in less than" msgstr "Срок действия истекает менее чем через" @@ -6865,8 +6829,8 @@ msgstr "Выражение не может быть пустым" msgid "Expression constructor" msgstr "Конструктор выражения" -#: include/forms.inc.php:1897 include/forms.inc.php:1904 -#: include/forms.inc.php:1914 +#: include/forms.inc.php:1933 include/forms.inc.php:1940 +#: include/forms.inc.php:1950 msgid "Expression syntax error." msgstr "Синтаксическая ошибка в выражении." @@ -6903,7 +6867,7 @@ msgstr "ЛОЖЬ" msgid "FTP" msgstr "FTP" -#: include/classes/setup/CSetupWizard.php:437 +#: include/classes/setup/CSetupWizard.php:439 msgid "Fail" msgstr "Ошибка" @@ -7087,11 +7051,11 @@ msgstr "Заполнение" #: app/views/administration.module.list.php:44 #: app/views/administration.proxy.list.php:45 #: app/views/administration.script.list.php:42 -#: app/views/administration.token.list.php:37 +#: app/views/administration.token.list.php:35 #: app/views/administration.usergroup.list.php:44 #: app/views/administration.user.list.php:61 #: app/views/administration.userrole.list.php:44 -#: app/views/administration.user.token.list.php:37 +#: app/views/administration.user.token.list.php:35 #: app/views/configuration.correlation.list.php:47 #: app/views/configuration.discovery.list.php:47 #: app/views/configuration.host.list.php:58 @@ -7155,7 +7119,7 @@ msgstr "Поиск строки на веб странице. Возвращае msgid "Finish" msgstr "Финиш" -#: include/locales.inc.php:53 +#: include/locales.inc.php:40 msgid "Finnish (fi_FI)" msgstr "Финский (fi_FI)" @@ -7224,17 +7188,17 @@ msgstr "Данные формы" msgid "Formula" msgstr "Формула" -#: include/classes/api/services/CDiscoveryRule.php:1807 +#: include/classes/api/services/CDiscoveryRule.php:1810 #, c-format msgid "Formula missing for discovery rule \"%1$s\"." msgstr "Отсутствует формула у \"%1$s\" правила обнаружения." -#: include/classes/api/services/CDiscoveryRule.php:1598 +#: include/classes/api/services/CDiscoveryRule.php:1601 #, c-format msgid "Formula missing for override \"%1$s\"." msgstr "Отсутствует формула у \"%1$s\" замещения." -#: include/locales.inc.php:54 +#: include/locales.inc.php:41 msgid "French (fr_FR)" msgstr "Французский (fr_FR)" @@ -7271,7 +7235,7 @@ msgstr "URL веб-интерфейса" msgid "Frontend access" msgstr "Доступ к веб-интерфейсу" -#: app/views/administration.user.edit.php:649 +#: app/views/administration.user.edit.php:651 msgid "Frontend messaging" msgstr "Сообщения в веб-интерфейсе" @@ -7298,7 +7262,7 @@ msgid "GSM modem" msgstr "GSM модем" #: app/views/administration.gui.edit.php:29 -#: app/views/administration.gui.edit.php:142 +#: app/views/administration.gui.edit.php:144 #: include/classes/helpers/CMenuHelper.php:247 include/html.inc.php:889 msgid "GUI" msgstr "Веб-интерфейс" @@ -7333,11 +7297,11 @@ msgstr "Географические карты" msgid "Geomap" msgstr "Геокарта" -#: include/locales.inc.php:55 +#: include/locales.inc.php:42 msgid "Georgian (ka_GE)" msgstr "Грузинский (ka_GE)" -#: include/locales.inc.php:56 +#: include/locales.inc.php:43 msgid "German (de_DE)" msgstr "Немецкий (de_DE)" @@ -7359,7 +7323,7 @@ msgid "Get value from host" msgstr "Получить значение с узла сети" #: app/controllers/CControllerPopupTestTriggerExpr.php:48 -#: include/triggers.inc.php:1147 +#: include/triggers.inc.php:1144 msgid "Given expression is not a macro" msgstr "Заданное выражение не является макросом" @@ -7472,7 +7436,7 @@ msgstr "График (классический)" msgid "Graph added" msgstr "График добавлен" -#: graphs.php:387 +#: graphs.php:389 msgid "Graph copied" msgid_plural "Graphs copied" msgstr[0] "График скопирован" @@ -7576,7 +7540,7 @@ msgstr "График с именем \"%1$s\" уже существует в г #: app/views/monitoring.charts.view.php:40 app/views/popup.import.php:38 #: app/views/search.php:92 app/views/search.php:98 app/views/search.php:139 #: app/views/search.php:144 app/views/search.php:319 app/views/search.php:324 -#: graphs.php:481 include/html.inc.php:359 +#: graphs.php:483 include/html.inc.php:359 #: include/views/configuration.graph.edit.php:30 #: include/views/configuration.graph.list.php:46 #: include/views/configuration.host.discovery.list.php:196 @@ -7593,7 +7557,7 @@ msgstr "Графики" msgid "Graphs deleted" msgstr "График удален" -#: include/locales.inc.php:57 +#: include/locales.inc.php:44 msgid "Greek (el_GR)" msgstr "Греческий (el_GR)" @@ -7606,12 +7570,12 @@ msgstr "Сетка" msgid "Group" msgstr "Группа" -#: include/classes/api/services/CHostGroup.php:650 +#: include/classes/api/services/CHostGroup.php:656 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "Группа \"%1$s\" не может быть удалена, так как используется прототипом узлов сети." -#: include/classes/api/services/CHostGroup.php:700 +#: include/classes/api/services/CHostGroup.php:717 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как она используется в условии корреляции." @@ -7646,7 +7610,7 @@ msgstr "Группа для обнаруженных узлов сети" msgid "Group name" msgstr "Имя группы" -#: include/classes/api/services/CHostPrototype.php:1275 +#: include/classes/api/services/CHostPrototype.php:1165 #, c-format msgid "Group prototype cannot be based on a discovered host group \"%1$s\"." msgstr "Прототип группы не может основываться на обнаруженной группе узлов сети \"%1$s\"." @@ -7672,7 +7636,7 @@ msgstr "Сгруппировать по" msgid "Groups" msgstr "Группы" -#: include/classes/helpers/CMenuHelper.php:384 +#: include/classes/helpers/CMenuHelper.php:383 msgid "Guest user" msgstr "Гостевой пользователь" @@ -7745,7 +7709,7 @@ msgstr "Аппаратные средства (полная детализаци msgid "Hardware sensor reading. Returns float" msgstr "Значение аппаратного сенсора. Возвращает число с плавающей точкой" -#: include/classes/setup/CSetupWizard.php:511 +#: include/classes/setup/CSetupWizard.php:513 msgid "HashiCorp Vault" msgstr "HashiCorp Vault" @@ -7766,7 +7730,7 @@ msgstr "Заголовки" msgid "Headers already sent." msgstr "Заголовки уже отправлены." -#: include/locales.inc.php:58 +#: include/locales.inc.php:45 msgid "Hebrew (he_IL)" msgstr "Иврит (he_IL)" @@ -7779,8 +7743,8 @@ msgstr "Иврит (he_IL)" msgid "Height" msgstr "Высота" -#: include/classes/helpers/CMenuHelper.php:370 -#: include/classes/helpers/CMenuHelper.php:373 +#: include/classes/helpers/CMenuHelper.php:369 +#: include/classes/helpers/CMenuHelper.php:372 #: include/views/general.login.php:87 msgid "Help" msgstr "Помощь" @@ -7857,7 +7821,7 @@ msgstr "Подсвечивать всю строку" #: include/classes/screens/CScreenProblem.php:1312 #: include/classes/widgets/forms/CWidgetFormProblems.php:36 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49 -#: include/forms.inc.php:544 include/views/configuration.item.list.php:89 +#: include/forms.inc.php:580 include/views/configuration.item.list.php:89 #: include/views/configuration.item.prototype.list.php:64 items.php:259 #: jsLoader.php:372 msgid "History" @@ -7946,7 +7910,7 @@ msgstr "Расположение по горизонтали" #: include/classes/widgets/forms/CWidgetFormProblems.php:206 #: include/classes/widgets/forms/CWidgetFormProblems.php:207 #: include/hostgroups.inc.php:248 include/maps.inc.php:24 -#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:151 +#: include/triggers.inc.php:953 include/views/configuration.graph.list.php:151 #: include/views/configuration.host.discovery.list.php:192 #: include/views/configuration.host.prototype.edit.php:298 #: include/views/configuration.httpconf.list.php:130 @@ -7971,10 +7935,10 @@ msgstr[2] "Узлы сети" msgid "Host \"%1$s\" already exists." msgstr "Узел сети \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:1347 +#: include/classes/api/services/CHostGroup.php:1370 #: include/classes/api/services/CHost.php:958 -#: include/classes/api/services/CHost.php:1897 -#: include/classes/api/services/CHost.php:2130 +#: include/classes/api/services/CHost.php:1915 +#: include/classes/api/services/CHost.php:2148 #, c-format msgid "Host \"%1$s\" cannot be without host group." msgstr "Узел сети \"%1$s\" не может быть без группы узлов сети." @@ -8044,7 +8008,7 @@ msgstr "" #: app/partials/popup.operations.php:183 #: app/views/administration.script.edit.php:223 #: app/views/administration.script.list.php:81 -#: app/views/administration.user.edit.php:420 +#: app/views/administration.user.edit.php:422 #: app/views/monitoring.widget.problemhosts.view.php:31 #: app/views/monitoring.widget.problemsbysv.view.php:40 #: app/views/monitoring.widget.web.view.php:30 app/views/popup.generic.php:68 @@ -8057,17 +8021,17 @@ msgstr "" msgid "Host group" msgstr "Группа узлов сети" -#: include/classes/api/services/CHostGroup.php:743 +#: include/classes/api/services/CHostGroup.php:760 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Группа узлов сети \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:686 +#: include/classes/api/services/CHostGroup.php:703 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как используется в глобальном скрипте." -#: include/classes/api/services/CHostGroup.php:636 +#: include/classes/api/services/CHostGroup.php:642 #, c-format msgid "Host group \"%1$s\" is internal and cannot be deleted." msgstr "Группа узлов сети \"%1$s\" - внутренняя и не может быть удалена." @@ -8180,24 +8144,10 @@ msgstr "Сети узла сети" msgid "Host prototype" msgstr "Прототип узлов сети" -#: include/classes/api/services/CHostPrototype.php:980 -#, c-format -msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template." -msgstr "Прототип узлов сети \"%1$s\" уже существует у \"%2$s\", унаследованный из другого шаблона." - -#: include/classes/api/services/CHostPrototype.php:968 -#, c-format -msgid "Host prototype \"%1$s\" already exists on \"%2$s\"." -msgstr "Прототип узлов сети \"%1$s\" уже существует у \"%2$s\"." - -#: host_prototypes.php:288 +#: host_prototypes.php:304 msgid "Host prototype added" msgstr "Прототип узлов сети добавлен" -#: include/classes/api/services/CHostPrototype.php:1763 -msgid "Host prototype cannot have more than one default interface of the same type." -msgstr "Прототип узлов сети не может иметь более одного интерфейса по умолчанию одного типа." - #: host_prototypes.php:147 msgid "Host prototype deleted" msgstr "Прототип узлов сети удален" @@ -8206,19 +8156,29 @@ msgstr "Прототип узлов сети удален" msgid "Host prototype macros" msgstr "Макросы прототипов узлов сети" -#: host_prototypes.php:274 host_prototypes.php:304 host_prototypes.php:324 +#: host_prototypes.php:286 host_prototypes.php:320 host_prototypes.php:340 msgid "Host prototype updated" msgid_plural "Host prototypes updated" msgstr[0] "Прототип узлов сети обновлен" msgstr[1] "Прототипы узлов сети обновлен" msgstr[2] "Прототипы узлов сети обновлен" -#: include/classes/api/services/CHostPrototype.php:182 +#: include/classes/api/services/CHostPrototype.php:999 +#, c-format +msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\" of host \"%3$s\"." +msgstr "" + +#: include/classes/api/services/CHostPrototype.php:996 +#, c-format +msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\" of template \"%3$s\"." +msgstr "" + +#: include/classes/api/services/CHostPrototype.php:978 #, c-format msgid "Host prototype with host name \"%1$s\" already exists in discovery rule \"%2$s\"." msgstr "Прототип узла сети с именем узла сети \"%1$s\" уже существует в правиле обнаружения \"%2$s\"." -#: include/classes/api/services/CHostPrototype.php:183 +#: include/classes/api/services/CHostPrototype.php:1026 #, c-format msgid "Host prototype with visible name \"%1$s\" already exists in discovery rule \"%2$s\"." msgstr "Прототип узла сети с видимым именем \"%1$s\" уже существует в правиле обнаружения \"%2$s\"." @@ -8231,7 +8191,7 @@ msgstr "Прототип узла сети с видимым именем \"%1$s msgid "Host prototypes" msgstr "Прототипы узлов сети" -#: host_prototypes.php:340 +#: host_prototypes.php:356 msgid "Host prototypes deleted" msgstr "Прототипы узлов сети удалены" @@ -8264,20 +8224,28 @@ msgstr "Узел сети обновлен" msgid "Host with ID \"%1$s\" is not available." msgstr "Узел сети с ID \"%1$s\" недоступен." -#: include/classes/api/services/CHostGeneral.php:125 -#: include/classes/api/services/CHost.php:2028 -#: include/classes/api/services/CHost.php:2310 +#: include/classes/api/services/CHostGeneral.php:127 +#, c-format +msgid "Host with host name \"%1$s\" already exists." +msgstr "" + +#: include/classes/api/services/CHost.php:2046 +#: include/classes/api/services/CHost.php:2328 #, c-format msgid "Host with the same name \"%1$s\" already exists." msgstr "Узел сети с таким же именем \"%1$s\" уже существует." -#: include/classes/api/services/CHostGeneral.php:145 -#: include/classes/api/services/CHost.php:2034 -#: include/classes/api/services/CHost.php:2317 +#: include/classes/api/services/CHost.php:2052 +#: include/classes/api/services/CHost.php:2335 #, c-format msgid "Host with the same visible name \"%1$s\" already exists." msgstr "Узел сети с таким же видимым именем \"%1$s\" уже существует." +#: include/classes/api/services/CHostGeneral.php:147 +#, c-format +msgid "Host with visible name \"%1$s\" already exists." +msgstr "" + #: app/controllers/CControllerHostView.php:125 #: app/controllers/CControllerPopupGeneric.php:109 #: app/controllers/CControllerPopupGeneric.php:133 @@ -8307,7 +8275,7 @@ msgstr "Узел сети с таким же видимым именем \"%1$s\ #: include/classes/widgets/forms/CWidgetFormTopHosts.php:81 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:57 #: include/classes/widgets/forms/CWidgetFormWeb.php:51 -#: include/forms.inc.php:488 include/views/configuration.copy.elements.php:63 +#: include/forms.inc.php:524 include/views/configuration.copy.elements.php:63 #: include/views/configuration.graph.list.php:99 #: include/views/configuration.host.discovery.list.php:81 #: include/views/configuration.host.discovery.list.php:197 @@ -8349,7 +8317,7 @@ msgstr "Часы" msgid "Housekeeping" msgstr "Очистка истории" -#: include/locales.inc.php:59 +#: include/locales.inc.php:46 msgid "Hungarian (hu_HU)" msgstr "Венгерский (hu_HU)" @@ -8716,7 +8684,7 @@ msgid "Inaccessible graph prototype" msgstr "Недоступный прототип графиков" #: app/controllers/CControllerDashboardWidgetEdit.php:356 -#: host_prototypes.php:459 +#: host_prototypes.php:475 msgid "Inaccessible group" msgstr "Недоступная группа" @@ -8733,10 +8701,10 @@ msgid "Inaccessible item prototype" msgstr "Недоступный прототип элементов данных" #: app/partials/monitoring.host.view.html.php:105 -#: app/partials/monitoring.latest.view.html.php:213 +#: app/partials/monitoring.latest.view.html.php:210 #: app/views/configuration.host.list.php:269 #: include/classes/screens/CScreenProblem.php:386 -#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027 +#: include/hostgroups.inc.php:293 include/triggers.inc.php:2024 #: include/views/inventory.host.view.php:42 msgid "Inaccessible maintenance" msgstr "Недоступное обслуживание" @@ -8752,11 +8720,11 @@ msgstr "" #: httpconf.php:661 include/graphs.inc.php:274 include/hosts.inc.php:649 #: include/httptest.inc.php:222 include/items.inc.php:916 -#: include/triggers.inc.php:2166 +#: include/triggers.inc.php:2163 msgid "Inaccessible template" msgstr "Недоступный шаблон" -#: include/triggers.inc.php:2372 include/triggers.inc.php:2380 +#: include/triggers.inc.php:2369 include/triggers.inc.php:2377 msgid "Inaccessible trigger" msgstr "Недоступный триггер" @@ -8966,10 +8934,8 @@ msgstr "Некорректный пользователь операции де #: include/classes/api/services/CHostInterface.php:1129 #: include/classes/api/services/CHostInterface.php:1146 #: include/classes/api/services/CHost.php:1283 -#: include/classes/api/services/CHost.php:1982 -#: include/classes/api/services/CHost.php:2217 -#: include/classes/api/services/CHostPrototype.php:595 -#: include/classes/api/services/CHostPrototype.php:616 +#: include/classes/api/services/CHost.php:2000 +#: include/classes/api/services/CHost.php:2235 #: include/classes/api/services/CItemGeneral.php:272 #: include/classes/api/services/CItemGeneral.php:1222 #: include/classes/api/services/CItemGeneral.php:1259 @@ -9012,23 +8978,23 @@ msgid "Incorrect bulk value for interface." msgstr "Некорректное значение массового опроса для интерфейса." #: include/classes/api/services/CHost.php:981 -#: include/classes/api/services/CHost.php:1885 -#: include/classes/api/services/CHost.php:2223 +#: include/classes/api/services/CHost.php:1903 +#: include/classes/api/services/CHost.php:2241 #, c-format msgid "Incorrect characters used for host name \"%1$s\"." msgstr "Использованы некорректные символы в имени узла сети \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1802 +#: include/classes/api/services/CDiscoveryRule.php:1805 #, c-format msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Некорректные условия в правиле обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1808 +#: include/classes/api/services/CDiscoveryRule.php:1811 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." msgstr "Некорректное пользовательское выражение \"%2$s\" для правила обнаружения \"%1$s\": %3$s." -#: include/classes/api/services/CDiscoveryRule.php:1599 +#: include/classes/api/services/CDiscoveryRule.php:1602 #, c-format msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s." msgstr "Некорректное пользовательское выражение \"%2$s\" для замещения \"%1$s\": %3$s." @@ -9066,9 +9032,9 @@ msgstr "Некорректное имя поля \"%1$s\" или значени msgid "Incorrect fields for sysmap." msgstr "Некорректные поля для карты сети." -#: include/classes/setup/CSetupWizard.php:974 -#: include/classes/setup/CSetupWizard.php:978 -#: include/classes/setup/CSetupWizard.php:982 +#: include/classes/setup/CSetupWizard.php:976 +#: include/classes/setup/CSetupWizard.php:980 +#: include/classes/setup/CSetupWizard.php:984 #, c-format msgid "Incorrect file path for \"%1$s\": %2$s." msgstr "Некорректный путь к файлу для \"%1$s\": %2$s." @@ -9077,28 +9043,28 @@ msgstr "Некорректный путь к файлу для \"%1$s\": %2$s." msgid "Incorrect file upload." msgstr "Некорректный загружаемый файл." -#: include/classes/api/services/CDiscoveryRule.php:1838 +#: include/classes/api/services/CDiscoveryRule.php:1841 #, c-format msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Некорректный ID формулы условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1830 +#: include/classes/api/services/CDiscoveryRule.php:1833 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." msgstr "Некорректный макрос условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1634 +#: include/classes/api/services/CDiscoveryRule.php:1637 #, c-format msgid "Incorrect filter condition macro for override \"%1$s\"." msgstr "Некорректный макрос условия фильтра для замещения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1844 +#: include/classes/api/services/CDiscoveryRule.php:1847 #, c-format msgid "Incorrect filter condition operator for discovery rule \"%1$s\"." msgstr "Некорректный оператор условия фильтра для правила обнаружения \"%1$s\"." #: app/controllers/CControllerPopupTestTriggerExpr.php:49 -#: include/triggers.inc.php:1148 +#: include/triggers.inc.php:1145 msgid "Incorrect function is used" msgstr "Использована некорректная функция" @@ -9108,8 +9074,8 @@ msgstr "Некорректный индекс изображения." #: include/classes/api/services/CHostInterface.php:675 #: include/classes/api/services/CHost.php:964 -#: include/classes/api/services/CHost.php:1879 -#: include/classes/api/services/CHost.php:2116 +#: include/classes/api/services/CHost.php:1897 +#: include/classes/api/services/CHost.php:2134 #: include/classes/api/services/CTrigger.php:809 msgid "Incorrect input parameters." msgstr "Некорректные входные параметры." @@ -9124,8 +9090,8 @@ msgstr "Указан некорректный параметр DNS \"%1$s\" ин msgid "Incorrect interface port \"%1$s\" provided." msgstr "Указан некорректный порт \"%1$s\" интерфейса." -#: include/classes/api/services/CHost.php:2003 -#: include/classes/api/services/CHost.php:2206 +#: include/classes/api/services/CHost.php:2021 +#: include/classes/api/services/CHost.php:2224 #, c-format msgid "Incorrect inventory field \"%1$s\"." msgstr "Некорректное поле инвентарных данных \"%1$s\"." @@ -9144,7 +9110,7 @@ msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"." msgstr "В выражении триггера \"%2$s\" указан некорректный ключ элемента данных \"%1$s\"." #: app/controllers/CControllerPopupTestTriggerExpr.php:50 -#: include/triggers.inc.php:1149 +#: include/triggers.inc.php:1146 msgid "Incorrect item value type" msgstr "Некорректный тип значений элемента данных" @@ -9153,7 +9119,7 @@ msgstr "Некорректный тип значений элемента дан msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"." msgstr "Указан некорректный тип элемента данных \"%1$s\" для функции триггера \"%2$s\"." -#: include/forms.inc.php:1546 +#: include/forms.inc.php:1582 msgid "Incorrect list of items." msgstr "Некорректный список элементов данных." @@ -9214,8 +9180,8 @@ msgstr "" msgid "Incorrect source value." msgstr "Некорректное значение источника." -#: include/classes/api/services/CHost.php:1974 -#: include/classes/api/services/CHost.php:2172 +#: include/classes/api/services/CHost.php:1992 +#: include/classes/api/services/CHost.php:2190 #, c-format msgid "Incorrect status for host \"%1$s\"." msgstr "Некорректное состояние для узла сети \"%1$s\"." @@ -9249,7 +9215,7 @@ msgstr "Некорректное выражение прототипа триг msgid "Incorrect trigger prototype expression. Trigger prototype expression elements should not belong to a template and a host simultaneously." msgstr "Некорректное выражение прототипа триггеров. Элементы выражения прототипа триггеров не должны быть от шаблона и узла сети одновременно." -#: include/classes/api/services/CDiscoveryRule.php:1795 +#: include/classes/api/services/CDiscoveryRule.php:1798 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." msgstr "Некорректный тип вычисления для правила обнаружения \"%1$s\"." @@ -9394,8 +9360,8 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: app/controllers/CControllerWidgetTopHostsView.php:409 #: app/controllers/CControllerWidgetTopHostsView.php:421 #: include/classes/api/services/CConfiguration.php:167 -#: include/classes/api/services/CDiscoveryRule.php:1866 -#: include/classes/api/services/CDiscoveryRule.php:2280 +#: include/classes/api/services/CDiscoveryRule.php:1869 +#: include/classes/api/services/CDiscoveryRule.php:2283 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 #: include/classes/api/services/CDRule.php:221 @@ -9423,20 +9389,20 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/api/services/CEvent.php:820 #: include/classes/api/services/CEvent.php:877 #: include/classes/api/services/CHost.php:922 -#: include/classes/api/services/CHost.php:1765 -#: include/classes/api/services/CHost.php:1771 -#: include/classes/api/services/CHost.php:1786 -#: include/classes/api/services/CHost.php:1792 -#: include/classes/api/services/CHost.php:1797 -#: include/classes/api/services/CHost.php:1803 -#: include/classes/api/services/CHost.php:1811 -#: include/classes/api/services/CHost.php:1817 -#: include/classes/api/services/CHost.php:1826 -#: include/classes/api/services/CHost.php:1832 -#: include/classes/api/services/CHost.php:1906 -#: include/classes/api/services/CHost.php:1968 -#: include/classes/api/services/CHost.php:2139 -#: include/classes/api/services/CHost.php:2166 +#: include/classes/api/services/CHost.php:1783 +#: include/classes/api/services/CHost.php:1789 +#: include/classes/api/services/CHost.php:1804 +#: include/classes/api/services/CHost.php:1810 +#: include/classes/api/services/CHost.php:1815 +#: include/classes/api/services/CHost.php:1821 +#: include/classes/api/services/CHost.php:1829 +#: include/classes/api/services/CHost.php:1835 +#: include/classes/api/services/CHost.php:1844 +#: include/classes/api/services/CHost.php:1850 +#: include/classes/api/services/CHost.php:1924 +#: include/classes/api/services/CHost.php:1986 +#: include/classes/api/services/CHost.php:2157 +#: include/classes/api/services/CHost.php:2184 #: include/classes/api/services/CHttpTest.php:983 #: include/classes/api/services/CHttpTest.php:1079 #: include/classes/api/services/CItemGeneral.php:229 @@ -9532,14 +9498,14 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/import/CConfigurationImport.php:842 #: include/classes/import/CConfigurationImport.php:879 #: include/classes/import/CConfigurationImport.php:980 -#: include/classes/import/CConfigurationImport.php:1136 -#: include/classes/import/CConfigurationImport.php:2696 -#: include/classes/import/CConfigurationImport.php:2800 -#: include/classes/import/CConfigurationImport.php:2810 -#: include/classes/import/CConfigurationImport.php:2837 -#: include/classes/import/CConfigurationImport.php:2852 -#: include/classes/import/CConfigurationImport.php:2861 -#: include/classes/import/CConfigurationImport.php:2867 +#: include/classes/import/CConfigurationImport.php:1135 +#: include/classes/import/CConfigurationImport.php:2656 +#: include/classes/import/CConfigurationImport.php:2760 +#: include/classes/import/CConfigurationImport.php:2770 +#: include/classes/import/CConfigurationImport.php:2797 +#: include/classes/import/CConfigurationImport.php:2812 +#: include/classes/import/CConfigurationImport.php:2821 +#: include/classes/import/CConfigurationImport.php:2827 #: include/classes/validators/CActionCondValidator.php:66 #: include/classes/validators/CActionCondValidator.php:72 #: include/classes/validators/CActionCondValidator.php:83 @@ -9592,7 +9558,7 @@ msgstr "Увеличение на" msgid "Indicators" msgstr "" -#: include/locales.inc.php:60 +#: include/locales.inc.php:47 msgid "Indonesian (id_ID)" msgstr "Индонезийский (id_ID)" @@ -9671,7 +9637,7 @@ msgstr "Унаследованные и макросы из шаблонов" msgid "Inherited and trigger tags" msgstr "Унаследованные и собственные теги" -#: include/forms.inc.php:300 +#: include/forms.inc.php:318 msgid "Inherited items" msgstr "Унаследованные элементы данных" @@ -9693,8 +9659,8 @@ msgid "Insert expression" msgstr "Вставить выражение" #: include/classes/setup/CSetupWizard.php:74 -#: include/classes/setup/CSetupWizard.php:888 -#: include/classes/setup/CSetupWizard.php:911 +#: include/classes/setup/CSetupWizard.php:890 +#: include/classes/setup/CSetupWizard.php:913 msgid "Install" msgstr "Установка" @@ -9706,7 +9672,7 @@ msgstr "Инсталляция" msgid "Installer name" msgstr "Имя установщика" -#: include/classes/helpers/CMenuHelper.php:361 +#: include/classes/helpers/CMenuHelper.php:360 msgid "Integrations" msgstr "Интеграции" @@ -9776,7 +9742,7 @@ msgstr "Период хранения внутренних данных" #: include/classes/api/services/CGraphGeneral.php:733 #: include/classes/api/services/CTriggerGeneral.php:1035 #: include/classes/api/services/CTriggerGeneral.php:1416 -#: include/classes/api/services/CTriggerGeneral.php:1821 +#: include/classes/api/services/CTriggerGeneral.php:1822 #: include/classes/core/CJsonRpc.php:191 #: include/classes/import/validators/CXmlValidatorGeneral.php:226 #: include/classes/widgets/fields/CWidgetField.php:105 @@ -9800,7 +9766,7 @@ msgstr "Internet Explorer" #: app/partials/monitoring.latest.view.html.php:73 #: app/views/configuration.discovery.list.php:79 #: app/views/popup.lldoperation.php:115 -#: app/views/popup.massupdate.item.php:225 include/forms.inc.php:559 +#: app/views/popup.massupdate.item.php:225 include/forms.inc.php:595 #: include/views/configuration.host.discovery.edit.php:659 #: include/views/configuration.host.discovery.list.php:199 #: include/views/configuration.httpconf.list.php:136 @@ -9834,7 +9800,7 @@ msgstr "Ошибочное содержимое YAML файла." msgid "Invalid action condition: %1$s." msgstr "Ошибочное условие действия: %1$s." -#: app/controllers/CControllerPopupTriggerExpr.php:1570 +#: app/controllers/CControllerPopupTriggerExpr.php:1571 #, c-format msgid "Invalid condition: %1$s." msgstr "Ошибочное условие: %1$s." @@ -9904,35 +9870,29 @@ msgstr "Ошибочные параметры метода." #: include/classes/api/services/CAutoregistration.php:170 #: include/classes/api/services/CCorrelation.php:723 #: include/classes/api/services/CCorrelation.php:729 -#: include/classes/api/services/CDiscoveryRule.php:1646 -#: include/classes/api/services/CDiscoveryRule.php:1666 -#: include/classes/api/services/CDiscoveryRule.php:1679 -#: include/classes/api/services/CDiscoveryRule.php:1698 -#: include/classes/api/services/CDiscoveryRule.php:1709 -#: include/classes/api/services/CDiscoveryRule.php:1721 -#: include/classes/api/services/CDiscoveryRule.php:1729 -#: include/classes/api/services/CDiscoveryRule.php:1740 -#: include/classes/api/services/CDiscoveryRule.php:1752 -#: include/classes/api/services/CDiscoveryRule.php:1886 -#: include/classes/api/services/CDiscoveryRule.php:1972 -#: include/classes/api/services/CDiscoveryRule.php:1989 -#: include/classes/api/services/CDiscoveryRule.php:2007 -#: include/classes/api/services/CDiscoveryRule.php:2015 +#: include/classes/api/services/CDiscoveryRule.php:1649 +#: include/classes/api/services/CDiscoveryRule.php:1669 +#: include/classes/api/services/CDiscoveryRule.php:1682 +#: include/classes/api/services/CDiscoveryRule.php:1701 +#: include/classes/api/services/CDiscoveryRule.php:1712 +#: include/classes/api/services/CDiscoveryRule.php:1724 +#: include/classes/api/services/CDiscoveryRule.php:1732 +#: include/classes/api/services/CDiscoveryRule.php:1743 +#: include/classes/api/services/CDiscoveryRule.php:1755 +#: include/classes/api/services/CDiscoveryRule.php:1889 +#: include/classes/api/services/CDiscoveryRule.php:1975 +#: include/classes/api/services/CDiscoveryRule.php:1992 +#: include/classes/api/services/CDiscoveryRule.php:2010 +#: include/classes/api/services/CDiscoveryRule.php:2018 #: include/classes/api/services/CGraphGeneral.php:626 #: include/classes/api/services/CGraphGeneral.php:749 #: include/classes/api/services/CHostBase.php:55 #: include/classes/api/services/CHostBase.php:110 -#: include/classes/api/services/CHostBase.php:1416 -#: include/classes/api/services/CHostPrototype.php:325 -#: include/classes/api/services/CHostPrototype.php:1663 -#: include/classes/api/services/CHostPrototype.php:1668 -#: include/classes/api/services/CHostPrototype.php:1675 -#: include/classes/api/services/CHostPrototype.php:1680 -#: include/classes/api/services/CHostPrototype.php:1691 -#: include/classes/api/services/CHostPrototype.php:1696 -#: include/classes/api/services/CHostPrototype.php:1703 -#: include/classes/api/services/CHostPrototype.php:1709 -#: include/classes/api/services/CHostPrototype.php:1719 +#: include/classes/api/services/CHostBase.php:1540 +#: include/classes/api/services/CHostPrototype.php:1053 +#: include/classes/api/services/CHostPrototype.php:1196 +#: include/classes/api/services/CHostPrototype.php:1204 +#: include/classes/api/services/CHostPrototype.php:2166 #: include/classes/api/services/CHttpTest.php:372 #: include/classes/api/services/CItemGeneral.php:603 #: include/classes/api/services/CItemGeneral.php:616 @@ -9967,8 +9927,8 @@ msgstr "Ошибочные параметры метода." #: include/classes/api/services/CScript.php:910 #: include/classes/api/services/CTemplate.php:1017 #: include/classes/api/services/CTriggerGeneral.php:665 -#: include/classes/api/services/CTriggerGeneral.php:1773 -#: include/classes/api/services/CTriggerGeneral.php:1792 +#: include/classes/api/services/CTriggerGeneral.php:1774 +#: include/classes/api/services/CTriggerGeneral.php:1793 #: include/classes/api/services/CUser.php:908 #: include/classes/api/services/CUser.php:919 #: include/classes/api/services/CValueMap.php:432 @@ -9978,123 +9938,125 @@ msgstr "Ошибочные параметры метода." #: include/classes/helpers/CDashboardHelper.php:418 #: include/classes/helpers/CDashboardHelper.php:426 #: include/classes/helpers/CDashboardHelper.php:436 -#: include/classes/validators/CApiInputValidator.php:349 -#: include/classes/validators/CApiInputValidator.php:354 -#: include/classes/validators/CApiInputValidator.php:359 -#: include/classes/validators/CApiInputValidator.php:386 -#: include/classes/validators/CApiInputValidator.php:399 -#: include/classes/validators/CApiInputValidator.php:410 -#: include/classes/validators/CApiInputValidator.php:444 -#: include/classes/validators/CApiInputValidator.php:470 -#: include/classes/validators/CApiInputValidator.php:477 -#: include/classes/validators/CApiInputValidator.php:501 -#: include/classes/validators/CApiInputValidator.php:506 -#: include/classes/validators/CApiInputValidator.php:589 -#: include/classes/validators/CApiInputValidator.php:595 -#: include/classes/validators/CApiInputValidator.php:627 -#: include/classes/validators/CApiInputValidator.php:632 -#: include/classes/validators/CApiInputValidator.php:674 -#: include/classes/validators/CApiInputValidator.php:679 -#: include/classes/validators/CApiInputValidator.php:713 -#: include/classes/validators/CApiInputValidator.php:718 -#: include/classes/validators/CApiInputValidator.php:759 -#: include/classes/validators/CApiInputValidator.php:764 -#: include/classes/validators/CApiInputValidator.php:819 -#: include/classes/validators/CApiInputValidator.php:857 -#: include/classes/validators/CApiInputValidator.php:862 -#: include/classes/validators/CApiInputValidator.php:918 -#: include/classes/validators/CApiInputValidator.php:943 -#: include/classes/validators/CApiInputValidator.php:976 -#: include/classes/validators/CApiInputValidator.php:981 -#: include/classes/validators/CApiInputValidator.php:1032 -#: include/classes/validators/CApiInputValidator.php:1039 -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1078 -#: include/classes/validators/CApiInputValidator.php:1083 -#: include/classes/validators/CApiInputValidator.php:1119 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1183 -#: include/classes/validators/CApiInputValidator.php:1188 -#: include/classes/validators/CApiInputValidator.php:1203 -#: include/classes/validators/CApiInputValidator.php:1249 -#: include/classes/validators/CApiInputValidator.php:1295 -#: include/classes/validators/CApiInputValidator.php:1322 -#: include/classes/validators/CApiInputValidator.php:1327 -#: include/classes/validators/CApiInputValidator.php:1334 -#: include/classes/validators/CApiInputValidator.php:1365 -#: include/classes/validators/CApiInputValidator.php:1410 -#: include/classes/validators/CApiInputValidator.php:1415 -#: include/classes/validators/CApiInputValidator.php:1454 -#: include/classes/validators/CApiInputValidator.php:1459 -#: include/classes/validators/CApiInputValidator.php:1464 -#: include/classes/validators/CApiInputValidator.php:1510 -#: include/classes/validators/CApiInputValidator.php:1519 -#: include/classes/validators/CApiInputValidator.php:1525 -#: include/classes/validators/CApiInputValidator.php:1553 -#: include/classes/validators/CApiInputValidator.php:1563 -#: include/classes/validators/CApiInputValidator.php:1569 -#: include/classes/validators/CApiInputValidator.php:1607 -#: include/classes/validators/CApiInputValidator.php:1619 -#: include/classes/validators/CApiInputValidator.php:1628 -#: include/classes/validators/CApiInputValidator.php:1635 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1682 -#: include/classes/validators/CApiInputValidator.php:1699 -#: include/classes/validators/CApiInputValidator.php:1725 -#: include/classes/validators/CApiInputValidator.php:1732 -#: include/classes/validators/CApiInputValidator.php:1760 -#: include/classes/validators/CApiInputValidator.php:1799 -#: include/classes/validators/CApiInputValidator.php:1804 -#: include/classes/validators/CApiInputValidator.php:1831 -#: include/classes/validators/CApiInputValidator.php:1838 -#: include/classes/validators/CApiInputValidator.php:1865 -#: include/classes/validators/CApiInputValidator.php:1874 -#: include/classes/validators/CApiInputValidator.php:1911 -#: include/classes/validators/CApiInputValidator.php:1927 -#: include/classes/validators/CApiInputValidator.php:1938 -#: include/classes/validators/CApiInputValidator.php:1976 -#: include/classes/validators/CApiInputValidator.php:2067 -#: include/classes/validators/CApiInputValidator.php:2162 -#: include/classes/validators/CApiInputValidator.php:2167 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2204 -#: include/classes/validators/CApiInputValidator.php:2236 -#: include/classes/validators/CApiInputValidator.php:2248 -#: include/classes/validators/CApiInputValidator.php:2281 +#: include/classes/validators/CApiInputValidator.php:352 +#: include/classes/validators/CApiInputValidator.php:357 +#: include/classes/validators/CApiInputValidator.php:362 +#: include/classes/validators/CApiInputValidator.php:389 +#: include/classes/validators/CApiInputValidator.php:402 +#: include/classes/validators/CApiInputValidator.php:413 +#: include/classes/validators/CApiInputValidator.php:447 +#: include/classes/validators/CApiInputValidator.php:473 +#: include/classes/validators/CApiInputValidator.php:480 +#: include/classes/validators/CApiInputValidator.php:504 +#: include/classes/validators/CApiInputValidator.php:509 +#: include/classes/validators/CApiInputValidator.php:592 +#: include/classes/validators/CApiInputValidator.php:598 +#: include/classes/validators/CApiInputValidator.php:630 +#: include/classes/validators/CApiInputValidator.php:635 +#: include/classes/validators/CApiInputValidator.php:677 +#: include/classes/validators/CApiInputValidator.php:682 +#: include/classes/validators/CApiInputValidator.php:716 +#: include/classes/validators/CApiInputValidator.php:721 +#: include/classes/validators/CApiInputValidator.php:762 +#: include/classes/validators/CApiInputValidator.php:767 +#: include/classes/validators/CApiInputValidator.php:822 +#: include/classes/validators/CApiInputValidator.php:860 +#: include/classes/validators/CApiInputValidator.php:865 +#: include/classes/validators/CApiInputValidator.php:921 +#: include/classes/validators/CApiInputValidator.php:946 +#: include/classes/validators/CApiInputValidator.php:979 +#: include/classes/validators/CApiInputValidator.php:984 +#: include/classes/validators/CApiInputValidator.php:1035 +#: include/classes/validators/CApiInputValidator.php:1042 +#: include/classes/validators/CApiInputValidator.php:1076 +#: include/classes/validators/CApiInputValidator.php:1081 +#: include/classes/validators/CApiInputValidator.php:1086 +#: include/classes/validators/CApiInputValidator.php:1122 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1186 +#: include/classes/validators/CApiInputValidator.php:1191 +#: include/classes/validators/CApiInputValidator.php:1257 +#: include/classes/validators/CApiInputValidator.php:1303 +#: include/classes/validators/CApiInputValidator.php:1330 +#: include/classes/validators/CApiInputValidator.php:1335 +#: include/classes/validators/CApiInputValidator.php:1342 +#: include/classes/validators/CApiInputValidator.php:1373 +#: include/classes/validators/CApiInputValidator.php:1418 +#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1462 +#: include/classes/validators/CApiInputValidator.php:1467 +#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:1518 +#: include/classes/validators/CApiInputValidator.php:1527 +#: include/classes/validators/CApiInputValidator.php:1533 +#: include/classes/validators/CApiInputValidator.php:1561 +#: include/classes/validators/CApiInputValidator.php:1571 +#: include/classes/validators/CApiInputValidator.php:1577 +#: include/classes/validators/CApiInputValidator.php:1615 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:1636 +#: include/classes/validators/CApiInputValidator.php:1643 +#: include/classes/validators/CApiInputValidator.php:1648 +#: include/classes/validators/CApiInputValidator.php:1690 +#: include/classes/validators/CApiInputValidator.php:1707 +#: include/classes/validators/CApiInputValidator.php:1733 +#: include/classes/validators/CApiInputValidator.php:1740 +#: include/classes/validators/CApiInputValidator.php:1768 +#: include/classes/validators/CApiInputValidator.php:1807 +#: include/classes/validators/CApiInputValidator.php:1812 +#: include/classes/validators/CApiInputValidator.php:1839 +#: include/classes/validators/CApiInputValidator.php:1846 +#: include/classes/validators/CApiInputValidator.php:1873 +#: include/classes/validators/CApiInputValidator.php:1882 +#: include/classes/validators/CApiInputValidator.php:1919 +#: include/classes/validators/CApiInputValidator.php:1935 +#: include/classes/validators/CApiInputValidator.php:1946 +#: include/classes/validators/CApiInputValidator.php:1984 +#: include/classes/validators/CApiInputValidator.php:2075 +#: include/classes/validators/CApiInputValidator.php:2173 +#: include/classes/validators/CApiInputValidator.php:2178 +#: include/classes/validators/CApiInputValidator.php:2205 +#: include/classes/validators/CApiInputValidator.php:2215 +#: include/classes/validators/CApiInputValidator.php:2247 +#: include/classes/validators/CApiInputValidator.php:2259 #: include/classes/validators/CApiInputValidator.php:2292 -#: include/classes/validators/CApiInputValidator.php:2324 +#: include/classes/validators/CApiInputValidator.php:2303 #: include/classes/validators/CApiInputValidator.php:2335 -#: include/classes/validators/CApiInputValidator.php:2358 -#: include/classes/validators/CApiInputValidator.php:2373 -#: include/classes/validators/CApiInputValidator.php:2426 -#: include/classes/validators/CApiInputValidator.php:2436 -#: include/classes/validators/CApiInputValidator.php:2446 -#: include/classes/validators/CApiInputValidator.php:2470 -#: include/classes/validators/CApiInputValidator.php:2477 -#: include/classes/validators/CApiInputValidator.php:2499 -#: include/classes/validators/CApiInputValidator.php:2519 -#: include/classes/validators/CApiInputValidator.php:2549 -#: include/classes/validators/CApiInputValidator.php:2554 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2597 -#: include/classes/validators/CApiInputValidator.php:2622 -#: include/classes/validators/CApiInputValidator.php:2627 +#: include/classes/validators/CApiInputValidator.php:2346 +#: include/classes/validators/CApiInputValidator.php:2369 +#: include/classes/validators/CApiInputValidator.php:2384 +#: include/classes/validators/CApiInputValidator.php:2437 +#: include/classes/validators/CApiInputValidator.php:2447 +#: include/classes/validators/CApiInputValidator.php:2457 +#: include/classes/validators/CApiInputValidator.php:2481 +#: include/classes/validators/CApiInputValidator.php:2488 +#: include/classes/validators/CApiInputValidator.php:2510 +#: include/classes/validators/CApiInputValidator.php:2530 +#: include/classes/validators/CApiInputValidator.php:2560 +#: include/classes/validators/CApiInputValidator.php:2565 +#: include/classes/validators/CApiInputValidator.php:2601 +#: include/classes/validators/CApiInputValidator.php:2608 #: include/classes/validators/CApiInputValidator.php:2633 -#: include/classes/validators/CApiInputValidator.php:2666 -#: include/classes/validators/CApiInputValidator.php:2699 -#: include/classes/validators/CApiInputValidator.php:2706 -#: include/classes/validators/CApiInputValidator.php:2730 -#: include/classes/validators/CApiInputValidator.php:2737 -#: include/classes/validators/CApiInputValidator.php:2762 -#: include/classes/validators/CApiInputValidator.php:2769 -#: include/classes/validators/CApiInputValidator.php:2797 -#: include/classes/validators/CApiInputValidator.php:2802 -#: include/classes/validators/CApiInputValidator.php:2827 -#: include/classes/validators/CApiInputValidator.php:2834 -#: include/classes/validators/CApiInputValidator.php:2871 -#: include/classes/validators/CApiInputValidator.php:2877 -#: include/classes/validators/CApiInputValidator.php:2942 -#: include/classes/validators/CApiInputValidator.php:2970 +#: include/classes/validators/CApiInputValidator.php:2638 +#: include/classes/validators/CApiInputValidator.php:2644 +#: include/classes/validators/CApiInputValidator.php:2677 +#: include/classes/validators/CApiInputValidator.php:2710 +#: include/classes/validators/CApiInputValidator.php:2717 +#: include/classes/validators/CApiInputValidator.php:2741 +#: include/classes/validators/CApiInputValidator.php:2748 +#: include/classes/validators/CApiInputValidator.php:2773 +#: include/classes/validators/CApiInputValidator.php:2780 +#: include/classes/validators/CApiInputValidator.php:2808 +#: include/classes/validators/CApiInputValidator.php:2813 +#: include/classes/validators/CApiInputValidator.php:2838 +#: include/classes/validators/CApiInputValidator.php:2845 +#: include/classes/validators/CApiInputValidator.php:2882 +#: include/classes/validators/CApiInputValidator.php:2888 +#: include/classes/validators/CApiInputValidator.php:2953 +#: include/classes/validators/CApiInputValidator.php:2981 +#: include/classes/validators/CApiInputValidator.php:3017 +#: include/classes/validators/CApiInputValidator.php:3024 +#: include/classes/validators/CApiInputValidator.php:3030 #: include/classes/widgets/fields/CWidgetFieldDatePicker.php:145 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:128 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:489 @@ -10169,6 +10131,13 @@ msgstr "Ошибочный код ответа \"%1$s\"." #: include/classes/import/validators/C60XmlValidator.php:2511 #: include/classes/import/validators/C60XmlValidator.php:2588 #: include/classes/import/validators/C60XmlValidator.php:2594 +#: include/classes/import/validators/C62XmlValidator.php:2050 +#: include/classes/import/validators/C62XmlValidator.php:2280 +#: include/classes/import/validators/C62XmlValidator.php:2467 +#: include/classes/import/validators/C62XmlValidator.php:2487 +#: include/classes/import/validators/C62XmlValidator.php:2511 +#: include/classes/import/validators/C62XmlValidator.php:2588 +#: include/classes/import/validators/C62XmlValidator.php:2594 #: include/classes/import/validators/CXmlValidatorGeneral.php:163 #: include/classes/import/validators/CXmlValidatorGeneral.php:182 #: include/classes/import/validators/CXmlValidatorGeneral.php:201 @@ -10185,7 +10154,7 @@ msgstr "Ошибочный тег \"%1$s\": %2$s." msgid "Invalid time period." msgstr "Ошибочный период времени." -#: include/classes/validators/CApiInputValidator.php:2841 +#: include/classes/validators/CApiInputValidator.php:2852 #, c-format msgid "Invalid zoomparameter \"%1$s\": %2$s." msgstr "Ошибочный параметрмасштаба \"%1$s\": %2$s." @@ -10231,7 +10200,7 @@ msgstr "Невозможно отфильтровать по паролям по msgid "It is not possible to search by user password." msgstr "Невозможно выполнить поиск по паролям пользователей." -#: include/locales.inc.php:61 +#: include/locales.inc.php:48 msgid "Italian (it_IT)" msgstr "Итальянский (it_IT)" @@ -10243,12 +10212,11 @@ msgstr "Итальянский (it_IT)" #: include/classes/widgets/forms/CWidgetFormClock.php:47 #: include/classes/widgets/forms/CWidgetFormGraph.php:48 #: include/classes/widgets/forms/CWidgetFormItem.php:45 -#: include/forms.inc.php:897 include/views/configuration.graph.edit.php:179 +#: include/forms.inc.php:933 include/views/configuration.graph.edit.php:179 #: include/views/configuration.graph.edit.php:254 jsLoader.php:364 msgid "Item" msgstr "Элемент данных" -#: include/classes/api/services/CHostPrototype.php:1219 #: include/classes/api/services/CItem.php:61 #, c-format msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template." @@ -10269,7 +10237,7 @@ msgstr "Нельзя скопировать элемент данных \"%1$s\" msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d." msgstr "Элемент данных \"%1$s\" не может заполнять отсутствующее поле под номером \"%2$d\" инвентарных данных узла сети. Выберите из: от 0 (не заполнять) до %3$d." -#: include/classes/api/services/CDiscoveryRule.php:2281 +#: include/classes/api/services/CDiscoveryRule.php:2284 #: include/classes/api/services/CItemGeneral.php:2279 #, c-format msgid "Item \"%1$s\" does not exist or you have no access to this item" @@ -10316,7 +10284,7 @@ msgstr[2] "Элементы данных активированы" msgid "Item in \"not supported\" state" msgstr "Элемент данных в \"неподдерживаемом\" состоянии" -#: app/controllers/CControllerPopupTriggerExpr.php:1563 +#: app/controllers/CControllerPopupTriggerExpr.php:1564 msgid "Item not selected" msgstr "Элемент данных не выбран" @@ -10328,7 +10296,7 @@ msgstr "Отсутствуют параметры у предобработки #: app/controllers/CControllerAuditLogList.php:227 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:491 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48 -#: include/forms.inc.php:897 +#: include/forms.inc.php:933 #: include/views/js/configuration.host.discovery.edit.overr.js.php:165 msgid "Item prototype" msgstr "Прототип элемента данных" @@ -10563,12 +10531,12 @@ msgstr "Янв" msgid "January" msgstr "Январь" -#: include/locales.inc.php:63 +#: include/locales.inc.php:50 msgid "Japanese (ja_JP)" msgstr "Японский (ja_JP)" #: app/views/administration.mediatype.edit.php:219 -#: app/views/administration.script.edit.php:187 include/forms.inc.php:1329 +#: app/views/administration.script.edit.php:187 include/forms.inc.php:1365 #: include/items.inc.php:1861 #: include/views/configuration.host.discovery.edit.php:256 #: include/views/configuration.item.edit.php:312 @@ -10627,7 +10595,7 @@ msgstr "Фраза-пароль ключа" msgid "Kiosk mode" msgstr "Режим киоска" -#: include/locales.inc.php:62 +#: include/locales.inc.php:49 msgid "Korean (ko_KR)" msgstr "Корейский (ko_KR)" @@ -10648,7 +10616,7 @@ msgstr "Хост LDAP" msgid "LDAP is not configured" msgstr "LDAP не настроен" -#: app/controllers/CControllerAuthenticationUpdate.php:271 +#: app/controllers/CControllerAuthenticationUpdate.php:273 msgid "LDAP login successful" msgstr "Успешный вход через LDAP" @@ -10685,7 +10653,7 @@ msgstr "Подпись" msgid "Label location" msgstr "Расположение подписи" -#: app/views/administration.user.edit.php:247 +#: app/views/administration.user.edit.php:249 msgid "Language" msgstr "Язык" @@ -10751,8 +10719,8 @@ msgstr[2] "Последний %1$d лет" msgid "Last access" msgstr "Последний доступ" -#: app/views/administration.token.list.php:143 -#: app/views/administration.user.token.list.php:99 +#: app/views/administration.token.list.php:142 +#: app/views/administration.user.token.list.php:98 msgid "Last accessed at" msgstr "Время последнего использования" @@ -10826,7 +10794,7 @@ msgstr "Последние данные" msgid "Latest values" msgstr "Последние значения" -#: include/locales.inc.php:64 +#: include/locales.inc.php:51 msgid "Latvian (lv_LV)" msgstr "Латышский (lv_LV)" @@ -10869,7 +10837,7 @@ msgid "Legend" msgstr "Легенда" #: app/controllers/CControllerPopupTriggerExpr.php:673 -#: app/controllers/CControllerPopupTriggerExpr.php:791 +#: app/controllers/CControllerPopupTriggerExpr.php:792 msgid "Length" msgstr "Длина" @@ -10877,7 +10845,7 @@ msgstr "Длина" msgid "Licensed under" msgstr "Распространяется по лицензии" -#: app/views/administration.gui.edit.php:90 +#: app/views/administration.gui.edit.php:92 msgid "Limit for search and filter results" msgstr "Лимит элементов в результатах поиска и фильтрах" @@ -11021,7 +10989,7 @@ msgstr "Список установленных пакетов. Возвраща msgid "Listing of services. Returns 0 - if empty; text - list of services separated by a newline" msgstr "Список служб. Возвращает 0 если список пуст; текст - список служб разделенных переводом строки" -#: include/locales.inc.php:65 +#: include/locales.inc.php:52 msgid "Lithuanian (lt_LT)" msgstr "Литовский (lt_LT)" @@ -11154,7 +11122,7 @@ msgstr "Сумма MD5 файла. Возвращает символьную с msgid "Macro" msgstr "Макрос" -#: include/classes/api/services/CHostBase.php:1471 +#: include/classes/api/services/CHostBase.php:1590 #: include/classes/api/services/CTemplate.php:877 #: include/classes/api/services/CUserMacro.php:655 #, c-format @@ -11248,8 +11216,7 @@ msgstr "Обслуживание без сбора данных" msgid "Maintenance: %1$s" msgstr "Обслуживание: %1$s" -#: app/views/administration.token.view.php:42 -#: app/views/administration.user.token.view.php:41 +#: app/views/popup.token.view.php:51 msgid "Make sure to copy the auth token as you won't be able to view it after the page is closed." msgstr "Убедитесь, что скопировали токен аутентификации, так как вы не сможете просмотреть его после того, как закроете страницу." @@ -11470,19 +11437,19 @@ msgstr "Математические функции" msgid "Max" msgstr "Макс" -#: app/views/administration.gui.edit.php:102 +#: app/views/administration.gui.edit.php:104 msgid "Max count of elements to show inside table cell" msgstr "Макс. количество элементов отображаемое в ячейке таблицы" -#: app/views/administration.gui.edit.php:123 +#: app/views/administration.gui.edit.php:125 msgid "Max history display period" msgstr "Максимальный период отображения истории" -#: app/views/administration.gui.edit.php:96 +#: app/views/administration.gui.edit.php:98 msgid "Max number of columns and rows in overview tables" msgstr "Макс. количество колонок и строк в таблицах обзора" -#: app/views/administration.gui.edit.php:135 +#: app/views/administration.gui.edit.php:137 msgid "Max period for time selector" msgstr "Макс. период селектора периода времени" @@ -11533,8 +11500,8 @@ msgid "May" msgstr "Май" #: app/controllers/CControllerPopupMedia.php:167 -#: app/views/administration.user.edit.php:365 -#: app/views/administration.user.edit.php:376 app/views/popup.media.php:69 +#: app/views/administration.user.edit.php:367 +#: app/views/administration.user.edit.php:378 app/views/popup.media.php:69 msgid "Media" msgstr "Оповещения" @@ -11597,7 +11564,7 @@ msgstr "Способ оповещения с ID \"%1$s\" недоступен." #: app/views/administration.mediatype.edit.php:30 #: app/views/administration.mediatype.list.php:31 -#: app/views/popup.import.php:45 include/classes/helpers/CMenuHelper.php:307 +#: app/views/popup.import.php:45 include/classes/helpers/CMenuHelper.php:306 #: include/classes/helpers/CRoleHelper.php:428 msgid "Media types" msgstr "Способы оповещений" @@ -11661,8 +11628,8 @@ msgstr "Шаблон сообщений" msgid "Message templates" msgstr "Шаблоны сообщений" -#: app/views/administration.user.edit.php:654 -#: app/views/administration.user.edit.php:666 +#: app/views/administration.user.edit.php:656 +#: app/views/administration.user.edit.php:668 msgid "Message timeout" msgstr "Время отображения сообщения" @@ -11680,7 +11647,7 @@ msgstr "Сообщение/Команда" msgid "Messages" msgstr "Сообщения" -#: app/views/administration.user.edit.php:744 +#: app/views/administration.user.edit.php:746 msgid "Messaging" msgstr "Сообщения" @@ -11962,7 +11929,7 @@ msgstr "Mozilla Firefox" msgid "Multiple" msgstr "Множественный" -#: include/triggers.inc.php:990 +#: include/triggers.inc.php:987 msgid "Multiple PROBLEM events" msgstr "Множественные события ПРОБЛЕМА" @@ -12063,20 +12030,16 @@ msgstr "NTLM" #: app/views/administration.script.edit.php:92 #: app/views/administration.script.list.php:43 #: app/views/administration.script.list.php:74 -#: app/views/administration.token.edit.php:44 -#: app/views/administration.token.list.php:39 -#: app/views/administration.token.list.php:122 -#: app/views/administration.token.view.php:36 +#: app/views/administration.token.list.php:37 +#: app/views/administration.token.list.php:121 #: app/views/administration.usergroup.list.php:45 #: app/views/administration.usergroup.list.php:69 #: app/views/administration.user.list.php:67 #: app/views/administration.userrole.edit.php:41 #: app/views/administration.userrole.list.php:45 #: app/views/administration.userrole.list.php:62 -#: app/views/administration.user.token.edit.php:45 -#: app/views/administration.user.token.list.php:39 -#: app/views/administration.user.token.list.php:88 -#: app/views/administration.user.token.view.php:36 +#: app/views/administration.user.token.list.php:37 +#: app/views/administration.user.token.list.php:87 #: app/views/configuration.correlation.edit.php:46 #: app/views/configuration.correlation.edit.php:57 #: app/views/configuration.correlation.list.php:48 @@ -12111,7 +12074,8 @@ msgstr "NTLM" #: app/views/popup.services.php:60 app/views/popup.sla.edit.php:52 #: app/views/popup.sla.edit.php:129 app/views/popup.sla.edit.php:185 #: app/views/popup.sla.excludeddowntime.edit.php:39 -#: app/views/popup.tabfilter.edit.php:31 +#: app/views/popup.tabfilter.edit.php:31 app/views/popup.token.edit.php:44 +#: app/views/popup.token.view.php:35 #: app/views/popup.tophosts.column.edit.php:47 #: app/views/popup.valuemap.edit.php:103 #: app/views/reports.scheduledreport.list.php:47 @@ -12120,7 +12084,7 @@ msgstr "NTLM" #: graphs.php:43 host_discovery.php:48 httpconf.php:40 #: include/classes/screens/CScreenHttpTest.php:113 #: include/classes/widgets/CWidgetHelper.php:85 -#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1224 +#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1260 #: include/hosts.inc.php:109 include/views/configuration.action.edit.php:48 #: include/views/configuration.action.edit.php:59 #: include/views/configuration.action.list.php:72 @@ -12262,6 +12226,10 @@ msgstr "Утилизация сети (совокупность скоросте msgid "Never" msgstr "Никогда" +#: app/views/popup.token.edit.php:162 +msgid "New API token" +msgstr "" + #: app/views/popup.sla.edit.php:255 app/views/popup.sla.edit.php:283 msgid "New SLA" msgstr "" @@ -12337,8 +12305,8 @@ msgid "Next page" msgstr "Следующая страница" #: include/classes/setup/CSetupWizard.php:343 -#: include/classes/setup/CSetupWizard.php:601 -#: include/classes/setup/CSetupWizard.php:753 +#: include/classes/setup/CSetupWizard.php:603 +#: include/classes/setup/CSetupWizard.php:755 msgid "Next step" msgstr "Далее" @@ -12364,9 +12332,8 @@ msgstr "Далее" #: include/classes/screens/CScreenProblem.php:1098 #: include/classes/screens/CScreenProblem.php:1240 include/events.inc.php:198 #: include/events.inc.php:202 include/events.inc.php:392 -#: include/events.inc.php:396 include/triggers.inc.php:996 -#: include/triggers.inc.php:1001 -#: include/views/configuration.graph.list.php:208 +#: include/events.inc.php:396 include/triggers.inc.php:993 +#: include/triggers.inc.php:998 include/views/configuration.graph.list.php:208 #: include/views/configuration.host.prototype.list.php:144 #: include/views/configuration.host.prototype.list.php:160 #: include/views/configuration.httpconf.list.php:188 @@ -12396,12 +12363,12 @@ msgstr "Не задано \"%1$s\" для графика." msgid "No \"%1$s\" given for map." msgstr "Не указан \"%1$s\" у карты сети." -#: include/classes/api/services/CDiscoveryRule.php:1848 +#: include/classes/api/services/CDiscoveryRule.php:1851 #, c-format msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"." msgstr "Не указано \"%2$s\" для условия фильтра правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1814 +#: include/classes/api/services/CDiscoveryRule.php:1817 #, c-format msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"." msgstr "Не указано \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"." @@ -12442,7 +12409,6 @@ msgid "No data." msgstr "Данные отсутствуют." #: include/classes/api/services/CHostInterface.php:1023 -#: include/classes/api/services/CHostPrototype.php:1756 #, c-format msgid "No default interface for \"%1$s\" type on \"%2$s\"." msgstr "Нет интерфейса по умолчанию для \"%1$s\" типа у \"%2$s\"." @@ -12456,7 +12422,7 @@ msgstr "Без деталей" msgid "No discovery rule IDs given." msgstr "ID правил обнаружения не указаны." -#: app/views/administration.user.edit.php:572 +#: app/views/administration.user.edit.php:574 #: app/views/administration.userrole.edit.php:253 msgid "No enabled modules found." msgstr "Активированные модули не найдены." @@ -12647,8 +12613,8 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CDiscoveryRule.php:574 #: include/classes/api/services/CDiscoveryRule.php:615 #: include/classes/api/services/CDiscoveryRule.php:651 -#: include/classes/api/services/CDiscoveryRule.php:1767 -#: include/classes/api/services/CDiscoveryRule.php:2041 +#: include/classes/api/services/CDiscoveryRule.php:1770 +#: include/classes/api/services/CDiscoveryRule.php:2044 #: include/classes/api/services/CDRule.php:190 #: include/classes/api/services/CDRule.php:316 #: include/classes/api/services/CDRule.php:343 @@ -12665,37 +12631,35 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CGraphPrototype.php:519 #: include/classes/api/services/CHistory.php:365 #: include/classes/api/services/CHostBase.php:97 -#: include/classes/api/services/CHostBase.php:951 -#: include/classes/api/services/CHostBase.php:1427 -#: include/classes/api/services/CHostGeneral.php:79 -#: include/classes/api/services/CHostGeneral.php:916 -#: include/classes/api/services/CHostGroup.php:598 -#: include/classes/api/services/CHostGroup.php:630 -#: include/classes/api/services/CHostGroup.php:1099 -#: include/classes/api/services/CHostGroup.php:1113 -#: include/classes/api/services/CHostGroup.php:1133 -#: include/classes/api/services/CHostGroup.php:1174 -#: include/classes/api/services/CHostGroup.php:1189 -#: include/classes/api/services/CHostGroup.php:1213 -#: include/classes/api/services/CHostGroup.php:1256 -#: include/classes/api/services/CHostGroup.php:1269 -#: include/classes/api/services/CHostGroup.php:1289 -#: include/classes/api/services/CHostGroup.php:1446 +#: include/classes/api/services/CHostBase.php:1090 +#: include/classes/api/services/CHostBase.php:1551 +#: include/classes/api/services/CHostGeneral.php:81 +#: include/classes/api/services/CHostGeneral.php:799 +#: include/classes/api/services/CHostGroup.php:606 +#: include/classes/api/services/CHostGroup.php:636 +#: include/classes/api/services/CHostGroup.php:1122 +#: include/classes/api/services/CHostGroup.php:1136 +#: include/classes/api/services/CHostGroup.php:1156 +#: include/classes/api/services/CHostGroup.php:1197 +#: include/classes/api/services/CHostGroup.php:1212 +#: include/classes/api/services/CHostGroup.php:1236 +#: include/classes/api/services/CHostGroup.php:1279 +#: include/classes/api/services/CHostGroup.php:1292 +#: include/classes/api/services/CHostGroup.php:1312 +#: include/classes/api/services/CHostGroup.php:1469 #: include/classes/api/services/CHostInterface.php:301 #: include/classes/api/services/CHostInterface.php:321 #: include/classes/api/services/CHostInterface.php:595 #: include/classes/api/services/CHostInterface.php:870 #: include/classes/api/services/CHostInterface.php:899 #: include/classes/api/services/CHost.php:1288 -#: include/classes/api/services/CHost.php:1323 -#: include/classes/api/services/CHost.php:1957 -#: include/classes/api/services/CHost.php:2122 -#: include/classes/api/services/CHostPrototype.php:543 -#: include/classes/api/services/CHostPrototype.php:602 -#: include/classes/api/services/CHostPrototype.php:623 -#: include/classes/api/services/CHostPrototype.php:1244 -#: include/classes/api/services/CHostPrototype.php:1266 -#: include/classes/api/services/CHostPrototype.php:1300 +#: include/classes/api/services/CHost.php:1332 +#: include/classes/api/services/CHost.php:1975 +#: include/classes/api/services/CHost.php:2140 +#: include/classes/api/services/CHostPrototype.php:580 +#: include/classes/api/services/CHostPrototype.php:1095 +#: include/classes/api/services/CHostPrototype.php:1158 +#: include/classes/api/services/CHostPrototype.php:2161 #: include/classes/api/services/CHttpTest.php:505 #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 @@ -12829,7 +12793,7 @@ msgstr "Не указан скрипт для команды в операции msgid "No target selected" msgstr "Цель не выбрана" -#: graphs.php:392 items.php:969 +#: graphs.php:394 items.php:969 msgid "No target selected." msgstr "Цель не выбрана." @@ -12851,7 +12815,7 @@ msgstr "Триггеры не заданы." msgid "No value" msgstr "Значение отсутствует" -#: include/classes/validators/CApiInputValidator.php:1144 +#: include/classes/validators/CApiInputValidator.php:1147 msgid "Non-boolean flags are deprecated." msgstr "Не-логические флаги устарели." @@ -12867,8 +12831,8 @@ msgstr "Не-логические флаги устарели." #: app/views/administration.mediatype.edit.php:90 #: app/views/administration.proxy.list.php:135 #: app/views/administration.proxy.list.php:148 -#: app/views/administration.user.edit.php:486 -#: app/views/administration.user.edit.php:531 +#: app/views/administration.user.edit.php:488 +#: app/views/administration.user.edit.php:533 #: app/views/administration.usergroup.edit.php:134 #: app/views/administration.userrole.edit.php:142 #: app/views/administration.userrole.edit.php:183 @@ -12893,7 +12857,7 @@ msgstr "Нет" #: app/partials/configuration.filter.items.php:177 #: app/views/popup.generic.php:506 include/graphs.inc.php:24 -#: include/items.inc.php:156 include/triggers.inc.php:989 +#: include/items.inc.php:156 include/triggers.inc.php:986 #: include/views/configuration.host.discovery.list.php:157 #: include/views/configuration.triggers.list.php:76 #: include/views/monitoring.history.php:256 @@ -12904,7 +12868,7 @@ msgstr "Нормальный" msgid "Normal view" msgstr "Нормальный вид" -#: include/locales.inc.php:66 +#: include/locales.inc.php:53 msgid "Norwegian (nb_NO)" msgstr "Норвежский (nb_NO)" @@ -12954,7 +12918,7 @@ msgstr "Недоступен" msgid "Not classified" msgstr "Не классифицировано" -#: include/forms.inc.php:297 +#: include/forms.inc.php:315 msgid "Not inherited items" msgstr "Без унаследованных элементов данных" @@ -13156,12 +13120,12 @@ msgstr "Системы счисления" #: app/partials/configuration.filter.items.php:138 #: app/views/popup.massupdate.item.php:156 include/items.inc.php:125 -#: include/triggers.inc.php:1594 include/views/configuration.item.edit.php:118 +#: include/triggers.inc.php:1591 include/views/configuration.item.edit.php:118 #: include/views/configuration.item.prototype.edit.php:104 msgid "Numeric (float)" msgstr "Числовой (с плавающей точкой)" -#: include/triggers.inc.php:1595 +#: include/triggers.inc.php:1592 msgid "Numeric (integer)" msgstr "Числовой (целочисленный)" @@ -13281,7 +13245,7 @@ msgstr "Вкл" msgid "On status change triggers blink for" msgstr "Мигание триггеров при изменении состояния" -#: app/views/administration.user.edit.php:664 +#: app/views/administration.user.edit.php:666 msgid "Once" msgstr "Один раз" @@ -13466,7 +13430,7 @@ msgstr "Опции" #: include/classes/widgets/forms/CWidgetFormTopHosts.php:93 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:69 #: include/classes/widgets/forms/CWidgetFormWeb.php:63 -#: include/triggers.inc.php:1064 +#: include/triggers.inc.php:1061 #: include/views/configuration.action.edit.php:126 #: include/views/configuration.host.discovery.edit.php:752 #: include/views/configuration.maintenance.edit.php:142 @@ -13546,7 +13510,7 @@ msgid "Original" msgstr "Оригинальное" #: app/views/administration.geomaps.edit.php:72 -#: include/classes/helpers/CMenuHelper.php:278 include/html.inc.php:901 +#: include/classes/helpers/CMenuHelper.php:277 include/html.inc.php:901 msgid "Other" msgstr "Другое" @@ -13869,14 +13833,14 @@ msgstr "Параметр" #: include/classes/api/services/CUser.php:492 #: include/classes/api/services/CUser.php:539 #: include/classes/api/services/CUser.php:1483 -#: include/classes/validators/CApiInputValidator.php:1245 +#: include/classes/validators/CApiInputValidator.php:1253 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Параметр \"%1$s\" устарел." #: app/views/administration.mediatype.edit.php:211 #: app/views/administration.script.edit.php:179 -#: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1225 +#: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1261 #: include/views/configuration.host.discovery.edit.php:245 #: include/views/configuration.item.edit.php:301 #: include/views/configuration.item.prototype.edit.php:287 @@ -13953,7 +13917,7 @@ msgstr "Пассивный" #: app/views/popup.massupdate.item.php:174 #: app/views/popup.massupdate.item.php:198 disc_prototypes.php:218 #: host_discovery.php:191 httpconf.php:74 -#: include/classes/setup/CSetupWizard.php:539 +#: include/classes/setup/CSetupWizard.php:541 #: include/views/configuration.host.discovery.edit.php:440 #: include/views/configuration.host.discovery.edit.php:581 #: include/views/configuration.host.discovery.edit.php:620 @@ -14010,7 +13974,7 @@ msgstr "Вставить виджет" msgid "Paste without external links" msgstr "Вставить без внешних связей" -#: app/controllers/CControllerPopupTriggerExpr.php:908 +#: app/controllers/CControllerPopupTriggerExpr.php:909 msgid "Pattern" msgstr "Шаблон" @@ -14065,7 +14029,7 @@ msgstr "Период" #: app/controllers/CControllerPopupTriggerExpr.php:96 #: app/controllers/CControllerPopupTriggerExpr.php:109 -#: app/controllers/CControllerPopupTriggerExpr.php:1095 +#: app/controllers/CControllerPopupTriggerExpr.php:1096 msgid "Period shift" msgstr "Сдвиг периода" @@ -14079,9 +14043,9 @@ msgid "Periods" msgstr "Периоды" #: app/partials/administration.usergroup.grouprights.html.php:29 -#: app/views/administration.user.edit.php:420 -#: app/views/administration.user.edit.php:440 -#: app/views/administration.user.edit.php:643 +#: app/views/administration.user.edit.php:422 +#: app/views/administration.user.edit.php:442 +#: app/views/administration.user.edit.php:645 #: app/views/administration.usergroup.edit.php:105 #: app/views/administration.usergroup.edit.php:156 #: app/views/administration.usergroup.edit.php:207 @@ -14092,11 +14056,11 @@ msgstr "Периоды" msgid "Permissions" msgstr "Права доступа" -#: app/views/administration.user.edit.php:445 +#: app/views/administration.user.edit.php:447 msgid "Permissions can be assigned for user groups only." msgstr "Права доступа могут быть назначены только группам пользователей." -#: include/locales.inc.php:67 +#: include/locales.inc.php:54 msgid "Persian (fa_IR)" msgstr "Персидский (fa_IR)" @@ -14109,21 +14073,21 @@ msgid "Placing algorithm" msgstr "Алгоритм размещения" #: app/views/administration.mediatype.edit.php:208 -#: include/classes/setup/CSetupWizard.php:510 +#: include/classes/setup/CSetupWizard.php:512 #: include/classes/widgets/CWidgetConfig.php:65 msgid "Plain text" msgstr "Простой текст" -#: app/views/administration.user.edit.php:685 -#: app/views/administration.user.edit.php:720 +#: app/views/administration.user.edit.php:687 +#: app/views/administration.user.edit.php:722 msgid "Play" msgstr "Воспроизвести" -#: app/views/administration.user.edit.php:658 +#: app/views/administration.user.edit.php:660 msgid "Play sound" msgstr "Воспроизведение звукового сигнала" -#: include/classes/setup/CSetupWizard.php:753 +#: include/classes/setup/CSetupWizard.php:755 #, c-format msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters." msgstr "Пожалуйста, проверьте параметры конфигурации. Если все верно, нажмите кнопку \"%1$s\" или кнопку \"%2$s\" для изменения параметров конфигурации." @@ -14136,7 +14100,7 @@ msgstr "Пожалуйста, подтвердите, что вы хотите msgid "Please confirm that you want to remove all value mappings." msgstr "Пожалуйста, подтвердите, что хотите удалить все преобразования значений." -#: include/classes/setup/CSetupWizard.php:601 +#: include/classes/setup/CSetupWizard.php:603 #, c-format msgid "Please create database manually, and set the configuration parameters for connection to this database. Press \"%1$s\" button when done." msgstr "Пожалуйста, создайте базу данных вручную и укажите параметры конфигурации для соединения с этой базой. Нажмите кнопку \"%1$s\" при завершении." @@ -14171,7 +14135,7 @@ msgstr "Размер точек" msgid "Points" msgstr "Точки" -#: include/locales.inc.php:68 +#: include/locales.inc.php:55 msgid "Polish (pl_PL)" msgstr "Польский (pl_PL)" @@ -14198,11 +14162,11 @@ msgstr "Порт не может быть пустым у интерфейса msgid "Port range" msgstr "Диапазон портов" -#: include/locales.inc.php:69 +#: include/locales.inc.php:56 msgid "Portuguese (pt_BR)" msgstr "Португальский (pt_BR)" -#: include/locales.inc.php:70 +#: include/locales.inc.php:57 msgid "Portuguese (pt_PT)" msgstr "Португальский (pt_PT)" @@ -14222,12 +14186,12 @@ msgstr "Тип Post" msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage" msgstr "Потребляемая мощность, <url> - URL службы VMware, <uuid> - имя хоста гипервизора VMware, <макс> - максимально разрешенная потребляемая мощность" -#: app/controllers/CControllerPopupTriggerExpr.php:863 +#: app/controllers/CControllerPopupTriggerExpr.php:864 msgid "Power value" msgstr "Значение степени" #: include/classes/setup/CSetupWizard.php:70 -#: include/classes/setup/CSetupWizard.php:751 +#: include/classes/setup/CSetupWizard.php:753 msgid "Pre-installation summary" msgstr "Предварительный обзор инсталляции" @@ -14388,7 +14352,7 @@ msgstr "Проблема создана" msgid "Problem display" msgstr "Отображение проблем" -#: include/triggers.inc.php:982 +#: include/triggers.inc.php:979 #: include/views/js/configuration.triggers.edit.js.php:70 msgid "Problem expression" msgstr "Выражение проблемы" @@ -14457,7 +14421,7 @@ msgstr "Утилизация CPU процессом в процентах. Во msgid "Process tags" msgstr "Обработка тегов" -#: include/classes/helpers/CMenuHelper.php:395 +#: include/classes/helpers/CMenuHelper.php:394 msgid "Profile" msgstr "Профиль" @@ -14490,7 +14454,7 @@ msgstr "Указанный URL \"%1$s\" ошибочен." #: app/controllers/CControllerPopupGeneric.php:157 #: app/views/administration.proxy.edit.php:28 #: app/views/administration.proxy.list.php:34 -#: include/classes/helpers/CMenuHelper.php:283 +#: include/classes/helpers/CMenuHelper.php:282 #: include/classes/helpers/CRoleHelper.php:423 msgid "Proxies" msgstr "Прокси" @@ -14529,7 +14493,7 @@ msgstr "Прокси \"%1$s\" используется действием \"%2$s msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"." msgstr "Прокси \"%1$s\" используется правилом обнаружения \"%2$s\"." -#: app/controllers/CControllerProxyCreate.php:114 +#: app/controllers/CControllerProxyCreate.php:115 msgid "Proxy added" msgstr "Прокси добавлен" @@ -14595,7 +14559,7 @@ msgstr "Поля запроса" #: app/controllers/CControllerQueueDetails.php:108 #: app/controllers/CControllerQueueOverview.php:80 #: app/controllers/CControllerQueueOverviewProxy.php:71 -#: include/classes/helpers/CMenuHelper.php:317 +#: include/classes/helpers/CMenuHelper.php:316 #: include/classes/helpers/CRoleHelper.php:430 msgid "Queue" msgstr "Очередь" @@ -14604,7 +14568,7 @@ msgstr "Очередь" #: app/views/administration.queue.details.php:39 #: app/views/administration.queue.overview.php:39 #: app/views/administration.queue.overview.proxy.php:39 -#: include/classes/helpers/CMenuHelper.php:323 +#: include/classes/helpers/CMenuHelper.php:322 msgid "Queue details" msgstr "Детали очереди" @@ -14612,7 +14576,7 @@ msgstr "Детали очереди" #: app/views/administration.queue.overview.php:27 #: app/views/administration.queue.overview.php:33 #: app/views/administration.queue.overview.proxy.php:33 -#: include/classes/helpers/CMenuHelper.php:319 +#: include/classes/helpers/CMenuHelper.php:318 msgid "Queue overview" msgstr "Обзор очереди" @@ -14620,7 +14584,7 @@ msgstr "Обзор очереди" #: app/views/administration.queue.overview.php:36 #: app/views/administration.queue.overview.proxy.php:27 #: app/views/administration.queue.overview.proxy.php:36 -#: include/classes/helpers/CMenuHelper.php:321 +#: include/classes/helpers/CMenuHelper.php:320 msgid "Queue overview by proxy" msgstr "Обзор очереди по прокси" @@ -14665,14 +14629,14 @@ msgstr "Только чтение" msgid "Read-only" msgstr "Только чтение" -#: app/views/administration.user.edit.php:522 -#: app/views/administration.user.edit.php:530 -#: app/views/administration.user.edit.php:544 +#: app/views/administration.user.edit.php:524 +#: app/views/administration.user.edit.php:532 +#: app/views/administration.user.edit.php:546 #: app/views/administration.userrole.edit.php:179 msgid "Read-only access to services" msgstr "Доступ к услугам только на чтение" -#: app/views/administration.user.edit.php:553 +#: app/views/administration.user.edit.php:555 #: app/views/administration.userrole.edit.php:203 msgid "Read-only access to services with tag" msgstr "Доступ к услугам с тегом только на чтение" @@ -14686,14 +14650,14 @@ msgstr "Доступ к услугам с тегом только на чтен msgid "Read-write" msgstr "Чтение-запись" -#: app/views/administration.user.edit.php:477 -#: app/views/administration.user.edit.php:485 -#: app/views/administration.user.edit.php:499 +#: app/views/administration.user.edit.php:479 +#: app/views/administration.user.edit.php:487 +#: app/views/administration.user.edit.php:501 #: app/views/administration.userrole.edit.php:138 msgid "Read-write access to services" msgstr "Доступ к услугам на чтение-запись" -#: app/views/administration.user.edit.php:508 +#: app/views/administration.user.edit.php:510 #: app/views/administration.userrole.edit.php:162 msgid "Read-write access to services with tag" msgstr "Доступ к услугам с тегом на чтение-запись" @@ -14739,7 +14703,7 @@ msgstr "Получатели" msgid "Recordset ID" msgstr "ID набора записей" -#: app/views/administration.user.edit.php:676 +#: app/views/administration.user.edit.php:678 #: include/classes/screens/CScreenProblem.php:1062 #: include/views/configuration.item.list.php:209 #: include/views/configuration.trigger.prototype.list.php:169 @@ -14747,7 +14711,7 @@ msgstr "ID набора записей" msgid "Recovery" msgstr "Восстановление" -#: include/triggers.inc.php:986 +#: include/triggers.inc.php:983 #: include/views/configuration.trigger.prototype.edit.php:305 #: include/views/configuration.trigger.prototype.edit.php:389 #: include/views/configuration.triggers.edit.php:330 @@ -14756,8 +14720,8 @@ msgstr "Восстановление" msgid "Recovery expression" msgstr "Выражение восстановления" -#: include/forms.inc.php:1948 include/forms.inc.php:1955 -#: include/forms.inc.php:1965 +#: include/forms.inc.php:1984 include/forms.inc.php:1991 +#: include/forms.inc.php:2001 msgid "Recovery expression syntax error." msgstr "Синтаксическая ошибка в выражении восстановления." @@ -14778,7 +14742,7 @@ msgstr "Время восстановления" msgid "Rectangle" msgstr "Прямоугольник" -#: app/views/administration.user.edit.php:270 +#: app/views/administration.user.edit.php:272 msgid "Refresh" msgstr "Обновить" @@ -14786,17 +14750,15 @@ msgstr "Обновить" msgid "Refresh interval" msgstr "Интервал обновления" -#: app/views/administration.token.edit.php:107 -#: app/views/administration.user.token.edit.php:89 +#: app/views/popup.token.edit.php:132 msgid "Regenerate" msgstr "Сгенерировать заново" -#: app/views/administration.token.edit.php:108 -#: app/views/administration.user.token.edit.php:90 +#: app/views/popup.token.edit.php:133 msgid "Regenerate selected API token? Previously generated token will become invalid." msgstr "Сгенерировать заново выбранный API токен? Ранее сгенерированный токен станет станет недействительным." -#: include/forms.inc.php:347 +#: include/forms.inc.php:371 msgid "Regular" msgstr "Обычные" @@ -14883,7 +14845,7 @@ msgstr "Удаленная команда" #: app/views/administration.regex.edit.php:80 #: app/views/administration.script.edit.php:43 #: app/views/administration.script.edit.php:77 -#: app/views/administration.user.edit.php:356 +#: app/views/administration.user.edit.php:358 #: app/views/configuration.correlation.edit.php:84 #: app/views/js/administration.iconmap.edit.js.php:54 #: app/views/js/administration.macros.edit.js.php:45 @@ -14918,8 +14880,8 @@ msgstr "Удаленная команда" #: include/classes/helpers/CTagFilterFieldHelper.php:135 #: include/classes/widgets/CWidgetHelper.php:594 #: include/classes/widgets/CWidgetHelper.php:688 -#: include/classes/widgets/CWidgetHelper.php:741 include/forms.inc.php:1491 -#: include/forms.inc.php:2039 include/views/configuration.action.edit.php:97 +#: include/classes/widgets/CWidgetHelper.php:741 include/forms.inc.php:1527 +#: include/forms.inc.php:2075 include/views/configuration.action.edit.php:97 #: include/views/configuration.action.edit.php:253 #: include/views/configuration.action.edit.php:281 #: include/views/configuration.action.edit.php:365 @@ -15069,7 +15031,7 @@ msgid "Replace dependencies" msgstr "Заменить зависимости" #: app/controllers/CControllerPopupTriggerExpr.php:678 -#: app/controllers/CControllerPopupTriggerExpr.php:913 +#: app/controllers/CControllerPopupTriggerExpr.php:914 msgid "Replacement" msgstr "Замена" @@ -15139,7 +15101,7 @@ msgstr "Запрос успешно отправлен" msgid "Request type" msgstr "Тип запроса" -#: include/classes/setup/CSetupWizard.php:421 +#: include/classes/setup/CSetupWizard.php:423 #: include/views/configuration.httpconf.edit.php:205 msgid "Required" msgstr "Требуется" @@ -15194,7 +15156,7 @@ msgid "Reset confirmation" msgstr "Сбросить подтверждение" #: app/views/administration.audit.settings.edit.php:65 -#: app/views/administration.gui.edit.php:145 +#: app/views/administration.gui.edit.php:147 #: app/views/administration.housekeeping.edit.php:187 #: app/views/administration.miscconfig.edit.php:190 #: app/views/administration.trigdisplay.edit.php:168 @@ -15406,12 +15368,12 @@ msgstr "Ось Y справа" msgid "Right trim" msgstr "Обрезать справа" -#: app/views/administration.user.edit.php:400 -#: app/views/administration.user.edit.php:410 +#: app/views/administration.user.edit.php:402 +#: app/views/administration.user.edit.php:412 msgid "Role" msgstr "Роль" -#: include/locales.inc.php:71 +#: include/locales.inc.php:58 msgid "Romanian (ro_RO)" msgstr "Румынский (ro_RO)" @@ -15423,7 +15385,7 @@ msgstr "Основная причина" msgid "Rows" msgstr "Строк" -#: app/views/administration.user.edit.php:275 +#: app/views/administration.user.edit.php:277 msgid "Rows per page" msgstr "Количество строк на странице" @@ -15455,7 +15417,7 @@ msgstr "Выполнение скрипта \"%1$s\" на узлах сети" msgid "Run specified command on the host. Returns text result of the command; 1 - with mode as nowait (regardless of command result)" msgstr "Выполнение заданной команды на узле сети. Возвращает текстовый результат команды; 1 - при наличии режима nowait (вне зависимости от результата команды)" -#: include/locales.inc.php:72 +#: include/locales.inc.php:59 msgid "Russian (ru_RU)" msgstr "Русский (ru_RU)" @@ -15782,7 +15744,7 @@ msgstr "Сохранить как" msgid "Save changes" msgstr "Сохранить изменения" -#: include/classes/setup/CSetupWizard.php:883 +#: include/classes/setup/CSetupWizard.php:885 #, c-format msgid "Save it as \"%1$s\"" msgstr "Сохранить как \"%1$s\"" @@ -15891,7 +15853,7 @@ msgstr "Границы" msgid "Script" msgstr "Скрипт" -#: include/classes/api/services/CScript.php:1348 +#: include/classes/api/services/CScript.php:1350 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Скрипт \"%1$s\" уже существует." @@ -15935,7 +15897,7 @@ msgstr "Скрипт обновлен" #: app/controllers/CControllerPopupScriptExec.php:75 #: app/views/administration.script.edit.php:30 #: app/views/administration.script.list.php:31 -#: include/classes/helpers/CMenuHelper.php:312 +#: include/classes/helpers/CMenuHelper.php:311 #: include/classes/helpers/CRoleHelper.php:429 jsLoader.php:381 msgid "Scripts" msgstr "Скрипты" @@ -15954,11 +15916,11 @@ msgid "Search pattern is empty" msgstr "Шаблон поиска пустой" #: app/controllers/CControllerPopupTriggerExpr.php:114 -#: app/controllers/CControllerPopupTriggerExpr.php:1105 +#: app/controllers/CControllerPopupTriggerExpr.php:1106 msgid "Season" msgstr "Сезон" -#: app/controllers/CControllerPopupTriggerExpr.php:1120 +#: app/controllers/CControllerPopupTriggerExpr.php:1121 msgid "Season deviation window" msgstr "Окно отклонения от сезона" @@ -16092,7 +16054,7 @@ msgstr "Отправка сообщения пользователям" msgid "Send only to" msgstr "Отправка только через" -#: app/views/administration.user.edit.php:294 app/views/popup.media.php:72 +#: app/views/administration.user.edit.php:296 app/views/popup.media.php:72 #: app/views/popup.media.php:79 app/views/popup.mediatypetest.edit.php:61 msgid "Send to" msgstr "Отправлять на" @@ -16294,13 +16256,12 @@ msgid "Set custom time period" msgstr "Пользовательский период времени" #: app/controllers/CControllerPopupItemTestSend.php:433 -#: app/views/js/popup.itemtestedit.view.js.php:371 include/forms.inc.php:1447 +#: app/views/js/popup.itemtestedit.view.js.php:371 include/forms.inc.php:1483 #: include/views/js/item.preprocessing.js.php:68 msgid "Set error to" msgstr "Задать ошибку в" -#: app/views/administration.token.edit.php:76 -#: app/views/administration.user.token.edit.php:58 +#: app/views/popup.token.edit.php:94 msgid "Set expiration date and time" msgstr "Задать дату и время срока действия" @@ -16324,7 +16285,7 @@ msgstr "Задать состояние в ОК" msgid "Set this view as default" msgstr "Задать этот вид умолчанием" -#: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1446 +#: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1482 #: include/views/js/item.preprocessing.js.php:67 msgid "Set value to" msgstr "Задать значение в" @@ -16343,7 +16304,7 @@ msgstr "Не удалось задать LDAP referral значением \"Off\ #: app/controllers/CControllerAuditLogList.php:238 #: include/classes/setup/CSetupWizard.php:66 -#: include/classes/setup/CSetupWizard.php:636 +#: include/classes/setup/CSetupWizard.php:638 msgid "Settings" msgstr "Настройки" @@ -16365,7 +16326,7 @@ msgstr "Настройки" #: include/classes/widgets/forms/CWidgetFormProblems.php:202 #: include/classes/widgets/forms/CWidgetFormProblems.php:203 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:350 -#: include/events.inc.php:188 include/triggers.inc.php:967 +#: include/events.inc.php:188 include/triggers.inc.php:964 #: include/views/configuration.item.list.php:171 #: include/views/configuration.trigger.prototype.edit.php:90 #: include/views/configuration.trigger.prototype.list.php:59 @@ -16503,7 +16464,7 @@ msgstr "Отображать боковую панель" #: app/partials/monitoring.host.filter.php:140 #: app/partials/monitoring.problem.filter.php:249 -#: app/views/administration.user.edit.php:738 +#: app/views/administration.user.edit.php:740 #: include/classes/widgets/forms/CWidgetFormDataOver.php:74 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:102 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:154 @@ -16519,7 +16480,7 @@ msgstr "Подавленные проблемы" msgid "Show tags" msgstr "Отображать теги" -#: app/views/administration.gui.edit.php:117 +#: app/views/administration.gui.edit.php:119 msgid "Show technical errors" msgstr "Отображение технических ошибок" @@ -16546,7 +16507,7 @@ msgstr "Только неподтвержденные" msgid "Show unavailable maps" msgstr "Отображать недоступные карты" -#: app/views/administration.gui.edit.php:107 +#: app/views/administration.gui.edit.php:109 msgid "Show warning if Zabbix server is down" msgstr "Показывать предупреждение, если Zabbix сервер недоступен" @@ -16578,8 +16539,8 @@ msgstr "Вход с HTTP" msgid "Sign in with Single Sign-On (SAML)" msgstr "Войти через систему единого входа (SAML)" -#: include/classes/helpers/CMenuHelper.php:413 -#: include/classes/helpers/CMenuHelper.php:416 +#: include/classes/helpers/CMenuHelper.php:411 +#: include/classes/helpers/CMenuHelper.php:414 msgid "Sign out" msgstr "Выход" @@ -16668,7 +16629,7 @@ msgstr "Размер полученного ответа от Zabbix серве msgid "Skipped copying of graph \"%1$s\" to host \"%2$s\"." msgstr "Пропущено копирование графика \"%1$s\" в узел сети \"%2$s\"." -#: include/locales.inc.php:73 +#: include/locales.inc.php:60 msgid "Slovak (sk_SK)" msgstr "Slovak (sk_SK)" @@ -16736,7 +16697,7 @@ msgstr "Источник" msgid "Source type" msgstr "Тип источника" -#: include/locales.inc.php:74 +#: include/locales.inc.php:61 msgid "Spanish (es_ES)" msgstr "Испанский (es_ES)" @@ -16780,7 +16741,7 @@ msgid "Standby" msgstr "Резервный" #: app/controllers/CControllerPopupTriggerExpr.php:668 -#: app/controllers/CControllerPopupTriggerExpr.php:786 +#: app/controllers/CControllerPopupTriggerExpr.php:787 msgid "Start" msgstr "Начало" @@ -16827,7 +16788,7 @@ msgstr "Инициализация TLS не удалась." msgid "Startup time of Zabbix server, Unix timestamp." msgstr "Время запуска Zabbix сервера, Unix timestamp." -#: app/partials/configuration.filter.items.php:174 include/forms.inc.php:516 +#: app/partials/configuration.filter.items.php:174 include/forms.inc.php:552 #: include/views/configuration.host.discovery.list.php:154 #: include/views/configuration.maintenance.list.php:63 #: include/views/configuration.maintenance.list.php:89 @@ -16861,14 +16822,14 @@ msgstr "Статистика и доступность кэша записи в #: app/views/administration.mediatype.list.php:84 #: app/views/administration.module.list.php:50 #: app/views/administration.module.list.php:78 -#: app/views/administration.token.list.php:91 -#: app/views/administration.token.list.php:148 -#: app/views/administration.user.edit.php:294 +#: app/views/administration.token.list.php:90 +#: app/views/administration.token.list.php:147 +#: app/views/administration.user.edit.php:296 #: app/views/administration.usergroup.list.php:50 #: app/views/administration.usergroup.list.php:78 #: app/views/administration.user.list.php:116 -#: app/views/administration.user.token.list.php:57 -#: app/views/administration.user.token.list.php:104 +#: app/views/administration.user.token.list.php:56 +#: app/views/administration.user.token.list.php:103 #: app/views/configuration.correlation.list.php:53 #: app/views/configuration.correlation.list.php:78 #: app/views/configuration.discovery.list.php:53 @@ -16901,7 +16862,7 @@ msgstr "Статистика и доступность кэша записи в #: include/classes/screens/CScreenProblem.php:1152 #: include/classes/widgets/forms/CWidgetFormActionLog.php:35 #: include/classes/widgets/forms/CWidgetFormActionLog.php:36 -#: include/events.inc.php:287 include/forms.inc.php:509 +#: include/events.inc.php:287 include/forms.inc.php:545 #: include/views/administration.auditacts.list.php:68 #: include/views/configuration.action.list.php:77 #: include/views/configuration.action.list.php:104 @@ -16989,8 +16950,8 @@ msgstr "Шаг с именем \"%1$s\" уже существует." msgid "Steps" msgstr "Шаги" -#: app/views/administration.user.edit.php:690 -#: app/views/administration.user.edit.php:725 +#: app/views/administration.user.edit.php:692 +#: app/views/administration.user.edit.php:727 msgid "Stop" msgstr "Остановить" @@ -17020,12 +16981,12 @@ msgstr "Остановлена" msgid "Storage period" msgstr "Период хранения" -#: include/classes/setup/CSetupWizard.php:508 +#: include/classes/setup/CSetupWizard.php:510 msgid "Store credentials in" msgstr "Хранение учётных данных в" -#: include/classes/setup/CSetupWizard.php:654 -#: include/classes/setup/CSetupWizard.php:655 +#: include/classes/setup/CSetupWizard.php:656 +#: include/classes/setup/CSetupWizard.php:657 msgid "Stored in HashiCorp Vault secret" msgstr "Хранение в HashiCorp Vault секрете" @@ -17034,7 +16995,7 @@ msgid "Straight" msgstr "Straight" #: app/controllers/CControllerPopupTriggerExpr.php:528 -#: include/triggers.inc.php:1596 +#: include/triggers.inc.php:1593 msgid "String" msgstr "Строка" @@ -17104,7 +17065,7 @@ msgstr "Воскресенье" msgid "Super admin" msgstr "Супер-администратор" -#: include/classes/helpers/CMenuHelper.php:354 +#: include/classes/helpers/CMenuHelper.php:353 #: include/views/general.login.php:94 msgid "Support" msgstr "Поддержка" @@ -17134,7 +17095,7 @@ msgstr "Статистика swap out (из памяти на устройств msgid "Swap space size in bytes or in percentage from total. Returns integer for bytes; float for percentage" msgstr "Размер файла подкачки в байтах или в процентах от всего размера. Возвращает целое число для байт; дробное для процентов" -#: include/locales.inc.php:75 +#: include/locales.inc.php:62 msgid "Swedish (sv_SE)" msgstr "Шведский (sv_SE)" @@ -17143,7 +17104,7 @@ msgid "Switching authentication method will reset all except this session! Conti msgstr "Переключение метода аутентификации сбросит все сессии исключая эту! Продолжить?" #: app/controllers/CControllerGuiEdit.php:33 -#: include/classes/setup/CSetupWizard.php:609 +#: include/classes/setup/CSetupWizard.php:611 msgid "System" msgstr "Системный" @@ -17359,7 +17320,7 @@ msgstr "Telnet" #: app/controllers/CControllerAuditLogList.php:240 #: app/views/administration.mediatype.edit.php:280 #: app/views/popup.massupdate.template.php:138 app/views/search.php:277 -#: include/actions.inc.php:49 include/forms.inc.php:523 +#: include/actions.inc.php:49 include/forms.inc.php:559 #: include/views/configuration.graph.list.php:151 #: include/views/configuration.host.discovery.list.php:192 #: include/views/configuration.httpconf.list.php:130 @@ -17374,7 +17335,7 @@ msgstr "Шаблон" msgid "Template \"%1$s\" already exists." msgstr "Шаблон \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:1348 +#: include/classes/api/services/CHostGroup.php:1371 #, c-format msgid "Template \"%1$s\" cannot be without host group." msgstr "Шаблон \"%1$s\" не может быть без группы узлов сети." @@ -17392,7 +17353,7 @@ msgstr "Шаблон добавлен" msgid "Template and host properties that are inherited through template linkage will be unlinked and cleared." msgstr "Свойства шаблона и узла сети, которые наследуются через присоединенный шаблон будут отсоединены и очищены." -#: include/classes/api/services/CHostBase.php:1257 +#: include/classes/api/services/CHostBase.php:1386 msgid "Template cannot be linked to another template more than once even through other templates." msgstr "Шаблон не может быть соединен с другим шаблоном несколько раз, даже через другие шаблоны." @@ -17436,20 +17397,28 @@ msgstr "Шаблон обновлен" msgid "Template value" msgstr "Значение шаблона" -#: include/classes/api/services/CHostGeneral.php:124 -#: include/classes/api/services/CHost.php:2049 -#: include/classes/api/services/CHost.php:2335 +#: include/classes/api/services/CHostGeneral.php:126 +#, c-format +msgid "Template with host name \"%1$s\" already exists." +msgstr "" + +#: include/classes/api/services/CHost.php:2067 +#: include/classes/api/services/CHost.php:2353 #, c-format msgid "Template with the same name \"%1$s\" already exists." msgstr "Шаблон с таким же именем \"%1$s\" уже существует." -#: include/classes/api/services/CHostGeneral.php:144 -#: include/classes/api/services/CHost.php:2055 -#: include/classes/api/services/CHost.php:2343 +#: include/classes/api/services/CHost.php:2073 +#: include/classes/api/services/CHost.php:2361 #, c-format msgid "Template with the same visible name \"%1$s\" already exists." msgstr "Шаблон с таким же видимым именем \"%1$s\" уже существует." +#: include/classes/api/services/CHostGeneral.php:146 +#, c-format +msgid "Template with visible name \"%1$s\" already exists." +msgstr "" + #: app/controllers/CControllerPopupGeneric.php:121 #: app/controllers/CControllerPopupImportCompare.php:132 #: app/controllers/CControllerPopupImportCompare.php:165 @@ -17479,7 +17448,7 @@ msgstr "Шаблон с таким же видимым именем \"%1$s\" у msgid "Templates" msgstr "Шаблоны" -#: include/classes/api/services/CHostBase.php:1099 +#: include/classes/api/services/CHostBase.php:1228 #, c-format msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"." msgstr "Шаблоны \"%1$s\" отсоединены от узлов сети \"%2$s\"." @@ -17496,7 +17465,7 @@ msgstr "Шаблоны обновлены" #: app/views/js/popup.itemtestedit.view.js.php:571 #: app/views/popup.itemtestedit.view.php:432 #: app/views/popup.mediatypetest.edit.php:99 -#: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1487 +#: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1523 #: include/views/configuration.host.discovery.edit.php:997 #: include/views/configuration.host.discovery.edit.php:1014 #: include/views/configuration.item.edit.php:1064 @@ -17511,7 +17480,7 @@ msgstr "Шаблоны обновлены" msgid "Test" msgstr "Тест" -#: include/forms.inc.php:1517 +#: include/forms.inc.php:1553 msgid "Test all steps" msgstr "Тест всех шагов" @@ -17603,7 +17572,7 @@ msgstr "Среднее время записи на виртуальный ди msgid "The cloned host contains user defined macros with type \"Secret text\". The value and type of these macros were reset." msgstr "Склонированный узел сети содержит пользовательские макросы с типом \"Скрытый текст\". Значения и тип этих макросов сброшены." -#: host_prototypes.php:168 +#: host_prototypes.php:162 msgid "The cloned host prototype contains user defined macros with type \"Secret text\". The value and type of these macros were reset." msgstr "Склонированный прототип узлов сети содержит пользовательские макросы с типом \"Скрытый текст\". Значения и тип этих макросов сброшены." @@ -17689,8 +17658,7 @@ msgstr "Полученный JSON не является корректным JSO msgid "The requested remote-procedure does not exist / is not available" msgstr "Запрашиваемая удаленная процедура не существует / недоступна" -#: app/views/administration.token.view.php:52 -#: app/views/administration.user.token.view.php:51 +#: app/views/popup.token.view.php:64 msgid "The token has expired. Please update the expiry date to use the token." msgstr "У токена истек срок действия. Пожалуйста, обновите дату истечения срока действия для использования этого токена." @@ -17703,7 +17671,7 @@ msgstr "Триггер более не обнаруживается и буде msgid "The trigger is not discovered anymore and will be deleted the next time discovery rule is processed." msgstr "Триггер более не обнаруживается и будет удален при следующей обработке правила обнаружения." -#: app/views/administration.user.edit.php:249 +#: app/views/administration.user.edit.php:251 msgid "Theme" msgstr "Тема" @@ -17818,7 +17786,7 @@ msgstr "Время конкретного процесса Zabbix или гру msgid "Time elapsed:" msgstr "Затрачено времени:" -#: app/views/administration.gui.edit.php:129 +#: app/views/administration.gui.edit.php:131 msgid "Time filter default period" msgstr "Период фильтра времени по умолчанию " @@ -17849,7 +17817,7 @@ msgstr "Сдвиг по времени" msgid "Time type" msgstr "Тип времени" -#: app/views/administration.user.edit.php:248 app/views/popup.sla.edit.php:83 +#: app/views/administration.user.edit.php:250 app/views/popup.sla.edit.php:83 msgid "Time zone" msgstr "Часовой пояс" @@ -18014,7 +17982,7 @@ msgstr "Период хранения динамики изменений" #: app/views/administration.housekeeping.edit.php:138 #: app/views/popup.tophosts.column.edit.php:164 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:50 -#: include/forms.inc.php:551 include/views/configuration.item.list.php:90 +#: include/forms.inc.php:587 include/views/configuration.item.list.php:90 #: include/views/configuration.item.prototype.list.php:65 items.php:260 msgid "Trends" msgstr "Динамика изменений" @@ -18022,7 +17990,7 @@ msgstr "Динамика изменений" #: app/controllers/CControllerAuditLogList.php:242 #: app/views/popup.massupdate.trigger.php:148 include/actions.inc.php:46 #: include/classes/graphdraw/CLineGraphDraw.php:471 include/events.inc.php:256 -#: include/maps.inc.php:26 include/triggers.inc.php:960 +#: include/maps.inc.php:26 include/triggers.inc.php:957 #: include/views/configuration.triggers.edit.php:583 #: include/views/js/monitoring.sysmaps.js.php:94 #: include/views/js/monitoring.sysmaps.js.php:791 @@ -18035,12 +18003,12 @@ msgstr "Триггер" msgid "Trigger \"%1$s\" already exists on \"%2$s\"." msgstr "Триггер \"%1$s\" уже существует у \"%2$s\"." -#: include/classes/api/services/CTriggerGeneral.php:1813 +#: include/classes/api/services/CTriggerGeneral.php:1814 #, c-format msgid "Trigger \"%1$s\" belongs to templates with different linkages." msgstr "Триггер \"%1$s\" принадлежит шаблонам с разными связями." -#: include/classes/import/CConfigurationImport.php:1840 +#: include/classes/import/CConfigurationImport.php:1800 #, c-format msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "Триггер \"%1$s\" зависит от триггера \"%2$s\", который не существует." @@ -18101,7 +18069,7 @@ msgstr[0] "Триггер активирован" msgstr[1] "Триггеры активированы" msgstr[2] "Триггеры активированы" -#: include/classes/api/services/CHostBase.php:1060 +#: include/classes/api/services/CHostBase.php:1189 #, c-format msgid "Trigger has items from template \"%1$s\" that is not linked to host." msgstr "У триггера есть элементы данных из шаблона \"%1$s\", которые не соединены с узлом сети." @@ -18110,7 +18078,7 @@ msgstr "У триггера есть элементы данных из шабл msgid "Trigger in \"unknown\" state" msgstr "Триггер в \"неизвестном\" состоянии" -#: include/classes/api/services/CHostBase.php:1010 +#: include/classes/api/services/CHostBase.php:1134 #, c-format msgid "Trigger in template \"%1$s\" has dependency with trigger in template \"%2$s\"." msgstr "У триггера из шаблона \"%1$s\" есть зависимость от триггера из шаблона \"%2$s\"." @@ -18140,22 +18108,22 @@ msgstr "Прототип триггеров" msgid "Trigger prototype \"%1$s\" already exists on \"%2$s\"." msgstr "Прототип триггера \"%1$s\" уже существует у \"%2$s\"." -#: include/classes/api/services/CTriggerGeneral.php:1817 +#: include/classes/api/services/CTriggerGeneral.php:1818 #, c-format msgid "Trigger prototype \"%1$s\" belongs to templates with different linkages." msgstr "Прототип триггера \"%1$s\" принадлежит шаблонам с разными связями." -#: include/classes/api/services/CTriggerGeneral.php:1715 +#: include/classes/api/services/CTriggerGeneral.php:1716 #, c-format msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules." msgstr "Прототип триггеров \"%1$s\" содержит прототипы элементов данных из нескольких правил обнаружения." -#: include/classes/import/CConfigurationImport.php:1521 +#: include/classes/import/CConfigurationImport.php:1481 #, c-format msgid "Trigger prototype \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "Прототип триггеров \"%1$s\" зависит от триггера \"%2$s\", который не существует." -#: include/classes/api/services/CTriggerGeneral.php:1710 +#: include/classes/api/services/CTriggerGeneral.php:1711 #, c-format msgid "Trigger prototype \"%1$s\" must contain at least one item prototype." msgstr "Прототип триггеров \"%1$s\" должен содержать по крайней мере один прототип элементов данных." @@ -18197,7 +18165,7 @@ msgstr "Прототипы триггеров удалены" msgid "Trigger prototypes updated" msgstr "Прототипы триггеров обновлены" -#: app/views/administration.user.edit.php:737 include/actions.inc.php:45 +#: app/views/administration.user.edit.php:739 include/actions.inc.php:45 msgid "Trigger severity" msgstr "Важность триггеров" @@ -18261,7 +18229,7 @@ msgstr "Вт" msgid "Tuesday" msgstr "Вторник" -#: include/locales.inc.php:76 +#: include/locales.inc.php:63 msgid "Turkish (tr_TR)" msgstr "Турецкий (tr_TR)" @@ -18287,7 +18255,7 @@ msgstr "Два и более полей не могут занимать одн #: app/views/administration.mediatype.list.php:83 #: app/views/administration.script.edit.php:112 #: app/views/administration.script.list.php:77 -#: app/views/administration.user.edit.php:294 +#: app/views/administration.user.edit.php:296 #: app/views/configuration.discovery.edit.php:78 #: app/views/monitoring.widget.actionlog.view.php:35 #: app/views/popup.condition.common.php:47 @@ -18343,7 +18311,7 @@ msgstr "Тип вычисления" #: app/controllers/CControllerPopupGeneric.php:234 #: app/controllers/CControllerPopupGeneric.php:285 #: app/partials/configuration.filter.items.php:146 -#: app/views/popup.massupdate.item.php:150 include/forms.inc.php:502 +#: app/views/popup.massupdate.item.php:150 include/forms.inc.php:538 #: include/views/configuration.item.edit.php:135 #: include/views/configuration.item.edit.php:1036 #: include/views/configuration.item.prototype.edit.php:121 @@ -18351,7 +18319,7 @@ msgstr "Тип вычисления" msgid "Type of information" msgstr "Тип информации" -#: include/forms.inc.php:495 +#: include/forms.inc.php:531 msgid "Types" msgstr "Типы" @@ -18380,7 +18348,7 @@ msgstr "НЕИЗВЕСТНО" msgid "URL" msgstr "URL" -#: app/views/administration.user.edit.php:280 +#: app/views/administration.user.edit.php:282 msgid "URL (after login)" msgstr "URL (после входа в систему)" @@ -18426,12 +18394,12 @@ msgstr "URL должно быть с обоими полями \"name\" и \"url msgid "URLs" msgstr "URLы" -#: include/classes/validators/CApiInputValidator.php:2627 -#: include/classes/validators/CApiInputValidator.php:2633 +#: include/classes/validators/CApiInputValidator.php:2638 +#: include/classes/validators/CApiInputValidator.php:2644 msgid "UUIDv4 is expected" msgstr "Ожидается UUIDv4" -#: include/locales.inc.php:77 +#: include/locales.inc.php:64 msgid "Ukrainian (uk_UA)" msgstr "Украинский (uk_UA)" @@ -18523,6 +18491,8 @@ msgstr "Неожиданный ответ для действия %1$s." #: app/controllers/CControllerSlaCreateUpdate.php:72 #: app/controllers/CControllerSlaCreateUpdate.php:76 +#: app/views/js/administration.token.list.js.php:116 +#: app/views/js/administration.user.token.list.js.php:116 #: app/views/js/configuration.host.edit.js.php:158 #: app/views/js/configuration.host.list.js.php:132 #: app/views/js/popup.host.edit.js.php:177 @@ -18532,6 +18502,7 @@ msgstr "Неожиданный ответ для действия %1$s." #: app/views/js/popup.sla.edit.js.php:232 #: app/views/js/popup.sla.edit.js.php:297 #: app/views/js/popup.sla.excludeddowntime.edit.js.php:78 +#: app/views/js/popup.token.edit.js.php:180 #: app/views/js/popup.tophosts.column.edit.js.php:113 #: app/views/js/service.list.js.php:189 app/views/js/sla.list.js.php:171 msgid "Unexpected server error." @@ -18548,7 +18519,7 @@ msgid "Units" msgstr "Единицы измерения" #: app/controllers/CControllerPopupMediatypeTestSend.php:177 -#: app/views/administration.token.list.php:170 +#: app/views/administration.token.list.php:168 #: app/views/monitoring.widget.hostavail.view.php:34 #: app/views/monitoring.widget.hostavail.view.php:66 #: app/views/monitoring.widget.hostavail.view.php:104 @@ -18567,7 +18538,7 @@ msgstr "Единицы измерения" #: include/items.inc.php:45 include/items.inc.php:110 #: include/items.inc.php:133 include/items.inc.php:167 #: include/maintenances.inc.php:33 include/maps.inc.php:39 -#: include/triggers.inc.php:83 include/triggers.inc.php:1872 +#: include/triggers.inc.php:83 include/triggers.inc.php:1869 #: include/users.inc.php:64 include/users.inc.php:87 #: include/views/configuration.action.edit.php:230 #: include/views/configuration.triggers.list.php:77 @@ -18587,13 +18558,13 @@ msgid "Unknown error" msgstr "Неизвестная ошибка" #: app/controllers/CControllerPopupTestTriggerExpr.php:47 -#: app/controllers/CControllerPopupTriggerExpr.php:1346 -#: include/triggers.inc.php:1146 +#: app/controllers/CControllerPopupTriggerExpr.php:1347 +#: include/triggers.inc.php:1143 msgid "Unknown host item, no such item in selected host" msgstr "Неизвестный элемент данных узла сети, такого элемента данных нет у выбранного узла сети" #: app/controllers/CControllerPopupTestTriggerExpr.php:46 -#: include/triggers.inc.php:1145 +#: include/triggers.inc.php:1142 msgid "Unknown host, no such host present in system" msgstr "Неизвестный узел сети, такого узла сети нет в системе" @@ -18667,12 +18638,12 @@ msgstr "Неподдерживаемый формат импорта \"%1$s\"." msgid "Unsupported operation." msgstr "Неподдерживаемая операция." -#: include/classes/api/services/CDiscoveryRule.php:1849 +#: include/classes/api/services/CDiscoveryRule.php:1852 #, c-format msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для правила обнаружения условия фильтра \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1815 +#: include/classes/api/services/CDiscoveryRule.php:1818 #, c-format msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"." @@ -18700,7 +18671,7 @@ msgstr "Доступен" #: app/views/administration.authentication.edit.php:338 #: app/views/administration.autoreg.edit.php:90 #: app/views/administration.geomaps.edit.php:122 -#: app/views/administration.gui.edit.php:144 +#: app/views/administration.gui.edit.php:146 #: app/views/administration.housekeeping.edit.php:186 #: app/views/administration.iconmap.edit.php:136 #: app/views/administration.image.edit.php:77 @@ -18711,13 +18682,11 @@ msgstr "Доступен" #: app/views/administration.proxy.edit.php:159 #: app/views/administration.regex.edit.php:145 #: app/views/administration.script.edit.php:282 -#: app/views/administration.token.edit.php:106 #: app/views/administration.trigdisplay.edit.php:167 -#: app/views/administration.user.edit.php:756 -#: app/views/administration.user.edit.php:779 +#: app/views/administration.user.edit.php:758 +#: app/views/administration.user.edit.php:781 #: app/views/administration.usergroup.edit.php:220 #: app/views/administration.userrole.edit.php:377 -#: app/views/administration.user.token.edit.php:88 #: app/views/configuration.correlation.edit.php:180 #: app/views/configuration.discovery.edit.php:153 #: app/views/configuration.host.edit.php:41 @@ -18736,6 +18705,7 @@ msgstr "Доступен" #: app/views/popup.service.statusrule.edit.php:98 #: app/views/popup.sla.edit.php:243 #: app/views/popup.sla.excludeddowntime.edit.php:91 +#: app/views/popup.token.edit.php:125 #: app/views/popup.tophosts.column.edit.php:254 #: app/views/popup.valuemap.edit.php:126 #: include/classes/html/CTabFilter.php:99 @@ -18835,7 +18805,7 @@ msgstr "Использовать пользовательские цвета с msgid "Use default" msgstr "Использовать умолчание" -#: app/views/administration.user.edit.php:294 app/views/popup.media.php:88 +#: app/views/administration.user.edit.php:296 app/views/popup.media.php:88 msgid "Use if severity" msgstr "Использовать, если важность" @@ -18851,13 +18821,12 @@ msgstr "Использование в действиях" #: app/controllers/CControllerAuditLogList.php:244 #: app/partials/js/scheduledreport.subscription.js.php:78 #: app/partials/popup.operations.php:105 -#: app/views/administration.token.edit.php:50 -#: app/views/administration.token.list.php:127 -#: app/views/administration.token.view.php:37 -#: app/views/administration.user.edit.php:284 +#: app/views/administration.token.list.php:126 +#: app/views/administration.user.edit.php:286 +#: app/views/popup.token.edit.php:60 app/views/popup.token.view.php:40 #: app/views/reports.auditlog.list.php:90 httpconf.php:65 #: include/actions.inc.php:1700 include/actions.inc.php:1754 -#: include/actions.inc.php:1976 include/classes/setup/CSetupWizard.php:534 +#: include/actions.inc.php:1976 include/classes/setup/CSetupWizard.php:536 #: include/hosts.inc.php:61 include/users.inc.php:52 #: include/views/configuration.httpconf.edit.php:165 msgid "User" @@ -18920,7 +18889,7 @@ msgstr "Строка user agent" msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Пользователь не может добавить себя в отключенную группу или в группу с отключенным доступом к Веб-интерфейсу." -#: app/views/administration.user.edit.php:403 +#: app/views/administration.user.edit.php:405 #: include/classes/api/services/CUser.php:966 msgid "User cannot change own role." msgstr "Пользователь не может изменить свою роль." @@ -19013,7 +18982,7 @@ msgstr "Группа пользователей с ID \"%1$s\" недоступ #: app/views/administration.usergroup.edit.php:28 #: app/views/administration.usergroup.list.php:31 #: app/views/popup.dashboard.share.edit.php:32 -#: include/classes/helpers/CMenuHelper.php:292 +#: include/classes/helpers/CMenuHelper.php:291 #: include/classes/helpers/CRoleHelper.php:425 #: include/views/monitoring.sysmap.edit.php:322 msgid "User groups" @@ -19087,7 +19056,7 @@ msgstr "Роль пользователя с ID \"%1$s\" недоступна." #: app/views/administration.user.list.php:73 #: app/views/administration.userrole.edit.php:28 #: app/views/administration.userrole.list.php:31 -#: include/classes/helpers/CMenuHelper.php:297 +#: include/classes/helpers/CMenuHelper.php:296 #: include/classes/helpers/CRoleHelper.php:426 msgid "User roles" msgstr "Роли пользователей" @@ -19096,8 +19065,8 @@ msgstr "Роли пользователей" msgid "User sessions" msgstr "Сессии пользователей" -#: include/classes/helpers/CMenuHelper.php:391 -#: include/classes/helpers/CMenuHelper.php:405 +#: include/classes/helpers/CMenuHelper.php:390 +#: include/classes/helpers/CMenuHelper.php:403 msgid "User settings" msgstr "Настройки пользователя" @@ -19107,7 +19076,7 @@ msgstr "Настройки пользователя" msgid "User sharing is missing parameters: %1$s for map \"%2$s\"." msgstr "Общий доступ пользователям имеет отсутствующие параметры: %1$s у карты сети \"%2$s\"." -#: app/views/administration.user.edit.php:414 +#: app/views/administration.user.edit.php:416 #: app/views/administration.userrole.edit.php:53 #: app/views/administration.userrole.edit.php:68 msgid "User type" @@ -19162,7 +19131,7 @@ msgid "Username and password" msgstr "Имя пользователя и пароль" #: include/classes/setup/CSetupWizard.php:206 -#: include/classes/setup/CSetupWizard.php:800 +#: include/classes/setup/CSetupWizard.php:802 msgid "Username and password must be stored in Vault secret keys \"username\" and \"password\"." msgstr "Имя пользователя и пароль должны храниться в ключах \"username\" и \"password\" Хранилища секретов." @@ -19171,7 +19140,7 @@ msgid "Username attribute" msgstr "Атрибут имени пользователя" #: app/controllers/CControllerPopupGeneric.php:209 -#: app/views/administration.token.list.php:44 +#: app/views/administration.token.list.php:42 #: app/views/administration.user.edit.php:35 #: app/views/administration.usergroup.edit.php:49 #: app/views/administration.usergroup.list.php:194 @@ -19182,7 +19151,7 @@ msgstr "Атрибут имени пользователя" #: app/views/administration.userrole.list.php:116 #: app/views/popup.dashboard.share.edit.php:53 #: app/views/reports.auditlog.list.php:47 -#: include/classes/helpers/CMenuHelper.php:302 +#: include/classes/helpers/CMenuHelper.php:301 #: include/classes/helpers/CRoleHelper.php:427 #: include/views/monitoring.sysmap.edit.php:359 msgid "Users" @@ -19615,13 +19584,13 @@ msgstr "Переменные" msgid "Various information about specific process(es). Returns float" msgstr "Различная информация о указанном процессе(ах). Возвращает число с плавающей точкой" -#: include/classes/setup/CSetupWizard.php:514 -#: include/classes/setup/CSetupWizard.php:694 +#: include/classes/setup/CSetupWizard.php:516 +#: include/classes/setup/CSetupWizard.php:696 msgid "Vault API endpoint" msgstr "API endpoint Хранилища" -#: include/classes/setup/CSetupWizard.php:527 -#: include/classes/setup/CSetupWizard.php:702 +#: include/classes/setup/CSetupWizard.php:529 +#: include/classes/setup/CSetupWizard.php:704 msgid "Vault authentication token" msgstr "Токен аутентификации Хранилища" @@ -19634,8 +19603,8 @@ msgstr "Ошибка подключения к Хранилищу." msgid "Vault secret" msgstr "Секрет Хранилища" -#: include/classes/setup/CSetupWizard.php:520 -#: include/classes/setup/CSetupWizard.php:698 +#: include/classes/setup/CSetupWizard.php:522 +#: include/classes/setup/CSetupWizard.php:700 msgid "Vault secret path" msgstr "Путь к секрету Хранилища" @@ -19647,7 +19616,7 @@ msgstr "Поставщик" msgid "Verbose" msgstr "Подробно" -#: include/classes/setup/CSetupWizard.php:558 +#: include/classes/setup/CSetupWizard.php:560 msgid "Verify database certificate" msgstr "Удостоверять сертификат базы данных" @@ -19680,7 +19649,7 @@ msgstr "Выравнивание по вертикали" msgid "Vertical position" msgstr "Расположение по вертикали" -#: include/locales.inc.php:78 +#: include/locales.inc.php:65 msgid "Vietnamese (vi_VN)" msgstr "Вьетнамский (vi_VN)" @@ -19705,7 +19674,7 @@ msgstr "Размер виртуального пространства в бай msgid "Visible name" msgstr "Видимое имя" -#: include/classes/api/services/CHost.php:2241 +#: include/classes/api/services/CHost.php:2259 msgid "Visible name cannot be empty if host name is missing." msgstr "Видимое имя не может быть пустым, если имя узла сети не заполнено." @@ -19731,7 +19700,7 @@ msgstr "П" msgid "Warning" msgstr "Предупреждение" -#: include/classes/setup/CSetupWizard.php:433 +#: include/classes/setup/CSetupWizard.php:435 msgctxt "setup" msgid "Warning" msgstr "Предупреждение" @@ -19861,7 +19830,7 @@ msgstr "Добро пожаловать" msgid "Welcome to" msgstr "Добро пожаловать в" -#: app/views/administration.user.edit.php:294 app/views/popup.media.php:83 +#: app/views/administration.user.edit.php:296 app/views/popup.media.php:83 msgid "When active" msgstr "Когда активен" @@ -19901,7 +19870,7 @@ msgstr "Виджет слишком маленький для указанног msgid "Width" msgstr "Ширина" -#: app/controllers/CControllerLatest.php:521 +#: app/controllers/CControllerLatest.php:530 msgid "With data" msgstr "" @@ -19914,7 +19883,7 @@ msgstr "Со cбором данных" msgid "With dependencies" msgstr "С зависимостями" -#: include/forms.inc.php:1397 include/views/js/item.preprocessing.js.php:238 +#: include/forms.inc.php:1433 include/views/js/item.preprocessing.js.php:238 msgid "With header row" msgstr "Со строкой заголовка" @@ -19928,11 +19897,11 @@ msgstr "С именем проблемы" msgid "With problems" msgstr "С проблемами" -#: include/forms.inc.php:325 include/forms.inc.php:530 +#: include/forms.inc.php:346 include/forms.inc.php:566 msgid "With triggers" msgstr "С триггерами" -#: app/controllers/CControllerLatest.php:526 +#: app/controllers/CControllerLatest.php:535 msgid "Without data" msgstr "" @@ -19940,11 +19909,11 @@ msgstr "" msgid "Without problems" msgstr "Без проблем" -#: include/forms.inc.php:322 +#: include/forms.inc.php:343 msgid "Without triggers" msgstr "Без триггеров" -#: app/views/administration.gui.edit.php:112 +#: app/views/administration.gui.edit.php:114 msgid "Working time" msgstr "Рабочее время" @@ -19958,8 +19927,8 @@ msgstr "Запись" msgid "Wrong Module.php class name for module located at %1$s." msgstr "Ошибочное имя класса Module.php для модуля расположенного в %1$s." -#: include/classes/api/services/CHost.php:1873 -#: include/classes/api/services/CHost.php:2110 +#: include/classes/api/services/CHost.php:1891 +#: include/classes/api/services/CHost.php:2128 #, c-format msgid "Wrong fields for host \"%1$s\"." msgstr "Ошибочные поля для узла сети \"%1$s\"." @@ -20022,7 +19991,7 @@ msgstr "Ожидается XML" msgid "XML to JSON" msgstr "XML в JSON" -#: include/forms.inc.php:1293 include/views/js/item.preprocessing.js.php:164 +#: include/forms.inc.php:1329 include/views/js/item.preprocessing.js.php:164 msgid "XPath" msgstr "XPath" @@ -20101,7 +20070,7 @@ msgstr "ГГГГ-ММ-ДД" msgid "YYYY-MM-DD hh:mm" msgstr "YYYY-MM-DD hh:mm" -#: include/translateDefines.inc.php:32 +#: app/views/popup.token.edit.php:106 include/translateDefines.inc.php:32 msgid "YYYY-MM-DD hh:mm:ss" msgstr "ГГГГ-ММ-ДД чч:мм:сс" @@ -20116,6 +20085,7 @@ msgstr "ГГГГ-ММ-ДД чч:мм:сс" #: include/classes/import/validators/C52XmlValidator.php:1993 #: include/classes/import/validators/C54XmlValidator.php:2048 #: include/classes/import/validators/C60XmlValidator.php:2050 +#: include/classes/import/validators/C62XmlValidator.php:2050 msgctxt "XML date and time format" msgid "YYYY-MM-DDThh:mm:ssZ" msgstr "YYYY-MM-DDThh:mm:ssZ" @@ -20149,9 +20119,8 @@ msgstr "Ежегодно" #: include/classes/screens/CScreenProblem.php:1098 #: include/classes/screens/CScreenProblem.php:1240 include/events.inc.php:198 #: include/events.inc.php:202 include/events.inc.php:392 -#: include/events.inc.php:396 include/triggers.inc.php:995 -#: include/triggers.inc.php:1000 -#: include/views/configuration.graph.list.php:208 +#: include/events.inc.php:396 include/triggers.inc.php:992 +#: include/triggers.inc.php:997 include/views/configuration.graph.list.php:208 #: include/views/configuration.host.prototype.list.php:144 #: include/views/configuration.host.prototype.list.php:160 #: include/views/configuration.httpconf.list.php:188 @@ -20175,9 +20144,9 @@ msgstr "Вчера" msgid "You are logged in as \"%1$s\"." msgstr "Вы вошли под именем \"%1$s\"." -#: app/views/administration.gui.edit.php:66 -#: app/views/administration.user.edit.php:233 -#: include/classes/setup/CSetupWizard.php:403 +#: app/views/administration.gui.edit.php:68 +#: app/views/administration.user.edit.php:235 +#: include/classes/setup/CSetupWizard.php:405 msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server." msgstr "Вы не можете выбрать некоторые языки, т.к. локали для них не установлены на вашем веб-сервере." @@ -20225,11 +20194,11 @@ msgstr "ZABBIX" msgid "Zabbix" msgstr "Zabbix" -#: include/classes/helpers/CMenuHelper.php:364 +#: include/classes/helpers/CMenuHelper.php:363 msgid "Zabbix Integrations" msgstr "Zabbix Интеграции" -#: include/classes/helpers/CMenuHelper.php:357 +#: include/classes/helpers/CMenuHelper.php:356 msgid "Zabbix Technical Support" msgstr "Техническая Поддержка Zabbix" @@ -20287,8 +20256,8 @@ msgstr "Zabbix сервер не запущен: отображаемая инф msgid "Zabbix server is running" msgstr "Zabbix сервер запущен" -#: include/classes/setup/CSetupWizard.php:614 -#: include/classes/setup/CSetupWizard.php:745 +#: include/classes/setup/CSetupWizard.php:616 +#: include/classes/setup/CSetupWizard.php:747 msgid "Zabbix server name" msgstr "Имя сервера Zabbix" @@ -20311,11 +20280,11 @@ msgstr "[Ошибочное значение для дня: \"%1$s\" ]" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "[Ошибочное значение для месяца: \"%1$s\" ]" -#: include/classes/validators/CApiInputValidator.php:2335 +#: include/classes/validators/CApiInputValidator.php:2346 msgid "a DNS name is expected" msgstr "ожидается DNS имя" -#: include/classes/validators/CApiInputValidator.php:1119 +#: include/classes/validators/CApiInputValidator.php:1122 msgid "a boolean is expected" msgstr "ожидается логическое" @@ -20326,13 +20295,13 @@ msgstr "ожидается логическое значение" #: include/classes/api/services/CUser.php:908 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:200 -#: include/classes/validators/CApiInputValidator.php:349 +#: include/classes/validators/CApiInputValidator.php:352 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "ожидается строка символов" -#: include/classes/validators/CApiInputValidator.php:2549 +#: include/classes/validators/CApiInputValidator.php:2560 msgid "a date in YYYY-MM-DD format is expected" msgstr "ожидается дата в ГГГГ-ММ-ДД формате" @@ -20355,37 +20324,37 @@ msgid "a digit" msgstr "цифру" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:819 +#: include/classes/validators/CApiInputValidator.php:822 msgid "a floating point value is expected" msgstr "ожидается значение с плавающей точкой" -#: include/classes/validators/CApiInputValidator.php:445 +#: include/classes/validators/CApiInputValidator.php:448 #: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "ожидается шестнадцатеричный код цвета (6 символов)" -#: include/classes/validators/CApiInputValidator.php:1804 +#: include/classes/validators/CApiInputValidator.php:1812 msgid "a low-level discovery macro is expected" msgstr "ожидается макрос низкоуровневого обнаружения" -#: include/classes/validators/CApiInputValidator.php:1640 +#: include/classes/validators/CApiInputValidator.php:1648 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "у числа слишком много десятичных точек" -#: include/classes/validators/CApiInputValidator.php:1073 -#: include/classes/validators/CApiInputValidator.php:1619 -#: include/classes/validators/CApiInputValidator.php:2358 +#: include/classes/validators/CApiInputValidator.php:1076 +#: include/classes/validators/CApiInputValidator.php:1627 +#: include/classes/validators/CApiInputValidator.php:2369 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "ожидается число" -#: include/classes/validators/CApiInputValidator.php:679 -#: include/classes/validators/CApiInputValidator.php:718 -#: include/classes/validators/CApiInputValidator.php:1083 -#: include/classes/validators/CApiInputValidator.php:1628 -#: include/classes/validators/CApiInputValidator.php:1635 -#: include/classes/validators/CApiInputValidator.php:1938 +#: include/classes/validators/CApiInputValidator.php:682 +#: include/classes/validators/CApiInputValidator.php:721 +#: include/classes/validators/CApiInputValidator.php:1086 +#: include/classes/validators/CApiInputValidator.php:1636 +#: include/classes/validators/CApiInputValidator.php:1643 +#: include/classes/validators/CApiInputValidator.php:1946 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "число слишком большое" @@ -20406,7 +20375,7 @@ msgstr "ожидается относительное время" msgid "a special character" msgstr "спецсимвол" -#: include/classes/validators/CApiInputValidator.php:2519 +#: include/classes/validators/CApiInputValidator.php:2530 msgid "a string, number or null value is expected" msgstr "ожидается строка, число или отсутствие значения" @@ -20423,7 +20392,7 @@ msgstr "ожидается время" msgid "a time not later than %1$s is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1838 +#: include/classes/validators/CApiInputValidator.php:1846 #: include/classes/validators/CNewValidator.php:252 msgid "a time period is expected" msgstr "ожидается период времени" @@ -20434,14 +20403,14 @@ msgstr "ожидался период времени" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1927 +#: include/classes/validators/CApiInputValidator.php:1935 #: include/classes/validators/CNewValidator.php:265 #: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 msgid "a time unit is expected" msgstr "ожидается единица времени" -#: include/classes/validators/CApiInputValidator.php:2877 +#: include/classes/validators/CApiInputValidator.php:2888 msgid "a timestamp is too large" msgstr "" @@ -20489,7 +20458,7 @@ msgstr "все" msgid "all media" msgstr "все способы оповещения" -#: include/classes/validators/CApiInputValidator.php:2248 +#: include/classes/validators/CApiInputValidator.php:2259 msgid "an IP address is expected" msgstr "ожидается IP адрес" @@ -20510,25 +20479,28 @@ msgstr "ожидается IP адрес" #: include/classes/import/validators/C60XmlValidator.php:2467 #: include/classes/import/validators/C60XmlValidator.php:2487 #: include/classes/import/validators/C60XmlValidator.php:2594 +#: include/classes/import/validators/C62XmlValidator.php:2467 +#: include/classes/import/validators/C62XmlValidator.php:2487 +#: include/classes/import/validators/C62XmlValidator.php:2594 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:627 -#: include/classes/validators/CApiInputValidator.php:759 -#: include/classes/validators/CApiInputValidator.php:857 -#: include/classes/validators/CApiInputValidator.php:976 -#: include/classes/validators/CApiInputValidator.php:1175 -#: include/classes/validators/CApiInputValidator.php:1410 -#: include/classes/validators/CApiInputValidator.php:1454 -#: include/classes/validators/CApiInputValidator.php:1760 -#: include/classes/validators/CApiInputValidator.php:2666 +#: include/classes/validators/CApiInputValidator.php:630 +#: include/classes/validators/CApiInputValidator.php:762 +#: include/classes/validators/CApiInputValidator.php:860 +#: include/classes/validators/CApiInputValidator.php:979 +#: include/classes/validators/CApiInputValidator.php:1178 +#: include/classes/validators/CApiInputValidator.php:1418 +#: include/classes/validators/CApiInputValidator.php:1462 +#: include/classes/validators/CApiInputValidator.php:1768 +#: include/classes/validators/CApiInputValidator.php:2677 msgid "an array is expected" msgstr "ожидается массив" -#: include/classes/validators/CApiInputValidator.php:1295 -#: include/classes/validators/CApiInputValidator.php:1365 +#: include/classes/validators/CApiInputValidator.php:1303 +#: include/classes/validators/CApiInputValidator.php:1373 msgid "an array or a character string is expected" msgstr "ожидается массив или строка символов" -#: include/classes/validators/CApiInputValidator.php:2499 +#: include/classes/validators/CApiInputValidator.php:2510 msgid "an array or object is expected" msgstr "ожидается массив или объект" @@ -20537,8 +20509,8 @@ msgstr "ожидается массив или объект" msgid "an empty string is expected" msgstr "ожидается пустая строка" -#: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1328 +#: include/classes/api/services/CHost.php:1816 +#: include/classes/validators/CApiInputValidator.php:1336 msgid "an even number of hexadecimal characters is expected" msgstr "ожидается четное количество шестнадцатеричных символов" @@ -20551,12 +20523,12 @@ msgstr "ожидается время указанное явно" msgid "an identifier is not defined in the formula" msgstr "идентификатор не задан в формуле" -#: include/classes/validators/CApiInputValidator.php:674 +#: include/classes/validators/CApiInputValidator.php:677 msgid "an integer is expected" msgstr "ожидается целое число" -#: include/classes/validators/CApiInputValidator.php:713 -#: include/classes/validators/CApiInputValidator.php:2871 +#: include/classes/validators/CApiInputValidator.php:716 +#: include/classes/validators/CApiInputValidator.php:2882 msgid "an unsigned integer is expected" msgstr "ожидается целое положительное число" @@ -20640,11 +20612,11 @@ msgstr "сред" msgid "avg() - Average value of a period T" msgstr "avg() - Среднее значение за период Т" -#: app/controllers/CControllerPopupTriggerExpr.php:1052 +#: app/controllers/CControllerPopupTriggerExpr.php:1053 msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period" msgstr "baselinedev() - Возвращает количество отклонения между периодами времени в сезонах и последним периодом данных" -#: app/controllers/CControllerPopupTriggerExpr.php:1059 +#: app/controllers/CControllerPopupTriggerExpr.php:1060 msgid "baselinewma() - Calculates baseline by averaging data periods in seasons" msgstr "baselinewma() - Вычисление базиса путем усреднения данных периодов в сезонах" @@ -20737,7 +20709,7 @@ msgstr "нельзя изменить" #: app/controllers/CControllerUserUpdateGeneral.php:111 #: include/classes/api/services/CAction.php:2745 #: include/classes/api/services/CAutoregistration.php:163 -#: include/classes/api/services/CDiscoveryRule.php:1990 +#: include/classes/api/services/CDiscoveryRule.php:1993 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 #: include/classes/api/services/CDRule.php:326 @@ -20745,11 +20717,8 @@ msgstr "нельзя изменить" #: include/classes/api/services/CDRule.php:364 #: include/classes/api/services/CDRule.php:547 #: include/classes/api/services/CEvent.php:820 -#: include/classes/api/services/CHost.php:1786 -#: include/classes/api/services/CHost.php:1792 -#: include/classes/api/services/CHostPrototype.php:1669 -#: include/classes/api/services/CHostPrototype.php:1681 -#: include/classes/api/services/CHostPrototype.php:1697 +#: include/classes/api/services/CHost.php:1804 +#: include/classes/api/services/CHost.php:1810 #: include/classes/api/services/CItemGeneral.php:481 #: include/classes/api/services/CItemGeneral.php:508 #: include/classes/api/services/CItemGeneral.php:514 @@ -20776,8 +20745,8 @@ msgstr "нельзя изменить" #: include/classes/api/services/CUser.php:919 #: include/classes/import/CConfigurationImport.php:746 #: include/classes/import/CConfigurationImport.php:981 -#: include/classes/import/CConfigurationImport.php:1137 -#: include/classes/import/CConfigurationImport.php:2838 +#: include/classes/import/CConfigurationImport.php:1136 +#: include/classes/import/CConfigurationImport.php:2798 #: include/classes/validators/CActionCondValidator.php:66 #: include/classes/validators/CActionCondValidator.php:72 #: include/classes/validators/CActionCondValidator.php:83 @@ -20791,14 +20760,14 @@ msgstr "нельзя изменить" #: include/classes/validators/CActionCondValidator.php:190 #: include/classes/validators/CActionCondValidator.php:196 #: include/classes/validators/CActionCondValidator.php:206 -#: include/classes/validators/CApiInputValidator.php:359 -#: include/classes/validators/CApiInputValidator.php:632 -#: include/classes/validators/CApiInputValidator.php:764 -#: include/classes/validators/CApiInputValidator.php:862 -#: include/classes/validators/CApiInputValidator.php:981 -#: include/classes/validators/CApiInputValidator.php:1078 -#: include/classes/validators/CApiInputValidator.php:1415 -#: include/classes/validators/CApiInputValidator.php:1459 +#: include/classes/validators/CApiInputValidator.php:362 +#: include/classes/validators/CApiInputValidator.php:635 +#: include/classes/validators/CApiInputValidator.php:767 +#: include/classes/validators/CApiInputValidator.php:865 +#: include/classes/validators/CApiInputValidator.php:984 +#: include/classes/validators/CApiInputValidator.php:1081 +#: include/classes/validators/CApiInputValidator.php:1423 +#: include/classes/validators/CApiInputValidator.php:1467 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20811,7 +20780,7 @@ msgstr "нельзя изменить" msgid "cannot be empty" msgstr "не может быть пустым" -#: include/classes/validators/CApiInputValidator.php:2971 +#: include/classes/validators/CApiInputValidator.php:2982 #, c-format msgid "cannot be less than or equal to the value of parameter \"%1$s\"" msgstr "" @@ -20830,14 +20799,32 @@ msgstr "не удалось отсоединить" msgid "cannot convert to JSON, result value too long" msgstr "не удалось сконвертировать в JSON, значение результата слишком длинное" +#: include/classes/api/services/CHostPrototype.php:2167 +msgid "cannot delete templated host prototype" +msgstr "" + +#: include/classes/api/services/CHostPrototype.php:1197 +msgid "cannot have more than one default interface of the same type" +msgstr "" + #: include/classes/helpers/CElasticsearchHelper.php:87 msgid "cannot perform Scroll API request, data could be truncated" msgstr "не удалось выполнить Scroll API запрос, данные могут быть обрезаны" -#: include/classes/api/services/CDiscoveryRule.php:1973 +#: include/classes/api/services/CDiscoveryRule.php:1976 msgid "cannot update property for templated discovery rule" msgstr "не удалось обновить свойство у правила обнаружения из шаблона" +#: include/classes/validators/CApiInputValidator.php:3031 +#, c-format +msgid "cannot update readonly parameter \"%1$s\" of discovered object" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:3025 +#, c-format +msgid "cannot update readonly parameter \"%1$s\" of inherited object" +msgstr "" + #: app/controllers/CControllerPopupTriggerExpr.php:491 msgid "cbrt() - Cube root" msgstr "cbrt() - Корень третьей степени" @@ -20868,7 +20855,7 @@ msgid "circular dependency is not allowed" msgstr "закольцованная зависимость не разрешена" #: include/classes/api/services/CItemGeneral.php:2316 -#: include/classes/import/CConfigurationImport.php:2853 +#: include/classes/import/CConfigurationImport.php:2813 msgid "circular item dependency is not allowed" msgstr "закольцованная зависимость элементов данных не разрешена" @@ -20947,15 +20934,15 @@ msgid "dayofweek() - Day of week" msgstr "dayofweek() - День недели" #: app/partials/monitoring.problem.filter.php:124 -#: app/views/administration.token.list.php:71 -#: app/views/administration.user.token.list.php:54 +#: app/views/administration.token.list.php:70 +#: app/views/administration.user.token.list.php:53 msgid "days" msgstr "дней" #: app/controllers/CControllerMapView.php:123 #: app/partials/js/configuration.valuemap.js.php:156 #: app/views/popup.generic.php:600 app/views/popup.valuemap.edit.php:83 -#: include/classes/setup/CSetupWizard.php:651 +#: include/classes/setup/CSetupWizard.php:653 #: include/classes/widgets/CWidgetHelper.php:87 msgid "default" msgstr "по умолчанию" @@ -20988,7 +20975,7 @@ msgstr "по убыванию" msgid "description" msgstr "описание" -#: include/classes/validators/CApiInputValidator.php:1699 +#: include/classes/validators/CApiInputValidator.php:1707 msgid "directory cannot be empty" msgstr "папка не может быть пустой" @@ -21076,7 +21063,7 @@ msgstr "пустое выражение" msgid "failed to parse JSON" msgstr "ошибка при разборе JSON" -#: include/classes/validators/CApiInputValidator.php:2769 +#: include/classes/validators/CApiInputValidator.php:2780 msgid "file format is unsupported" msgstr "формат файла не поддерживается" @@ -21115,7 +21102,7 @@ msgstr "четвёртый" msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)" msgstr "fuzzytime() - Разница между значением элемента данных (в виде отметки времени) и отметкой времени Zabbix сервера меньше чем или равна T секундам (1 - правда, 0 - ложь)" -#: include/classes/validators/CApiInputValidator.php:2835 +#: include/classes/validators/CApiInputValidator.php:2846 msgid "geographical coordinates (values of comma separated latitude and longitude) are expected" msgstr "ожидаются географические координаты (значения широты и долготы, разделенные запятой)" @@ -21163,7 +21150,7 @@ msgstr "иконка" msgid "image" msgstr "изображение" -#: include/classes/validators/CApiInputValidator.php:2763 +#: include/classes/validators/CApiInputValidator.php:2774 #, c-format msgid "image size must be less than %1$s" msgstr "размер изображения должен быть меньше чем %1$s" @@ -21181,7 +21168,7 @@ msgid "in() - Checks if a value equals to one of the listed values (1 - equals, msgstr "in() - Проверяет равно ли значение одному из перечисленных значений (1 - равно, 0 - в противном случае)" #: app/partials/administration.usergroup.grouprights.html.php:61 -#: app/views/administration.user.edit.php:430 +#: app/views/administration.user.edit.php:432 msgid "including subgroups" msgstr "включая подгруппы" @@ -21254,7 +21241,7 @@ msgstr "ошибочный диапазон адресов \"%1$s\"" msgid "invalid aggregation method" msgstr "ошибочный метод агрегации" -#: include/classes/validators/CApiInputValidator.php:354 +#: include/classes/validators/CApiInputValidator.php:357 msgid "invalid byte sequence in UTF-8" msgstr "ошибочная последовательность байт в UTF-8" @@ -21284,11 +21271,11 @@ msgstr "недопустимый четвертый параметр в функ msgid "invalid history storage period" msgstr "недопустимый период хранения истории" -#: include/classes/validators/CApiInputValidator.php:1519 +#: include/classes/validators/CApiInputValidator.php:1527 msgid "invalid host group name" msgstr "ошибочное имя группы узлов сети" -#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1571 msgid "invalid host name" msgstr "ошибочное имя узла сети" @@ -21299,13 +21286,13 @@ msgid "invalid number of parameters in function \"%1$s\"" msgstr "недопустимое количество параметров в функции \"%1$s\"" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:1039 -#: include/classes/validators/CApiInputValidator.php:2597 +#: include/classes/validators/CApiInputValidator.php:1042 +#: include/classes/validators/CApiInputValidator.php:2608 msgid "invalid range expression" msgstr "недопустимое выражение диапазона" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1874 +#: include/classes/validators/CApiInputValidator.php:1882 msgid "invalid regular expression" msgstr "ошибочное регулярное выражение" @@ -21344,7 +21331,7 @@ msgstr "больше чем или равно" msgid "is less than or equals" msgstr "меньше чем или равно" -#: include/classes/validators/CApiInputValidator.php:2167 +#: include/classes/validators/CApiInputValidator.php:2178 msgid "is not enclosed in {} or is malformed" msgstr "не заключено в {} или ошибочно" @@ -21370,7 +21357,7 @@ msgstr "ключ пустой" msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution" msgstr "kurtosis() - Измерение \"островершинности\" в распределении вероятностей" -#: include/forms.inc.php:1358 include/views/js/item.preprocessing.js.php:119 +#: include/forms.inc.php:1394 include/views/js/item.preprocessing.js.php:119 msgid "label" msgstr "метка" @@ -21403,27 +21390,27 @@ msgstr "left() - Возвращает самые левые символы" msgid "length() - Length of last (most recent) T value in characters" msgstr "length() - Длина последнего (самого свежего) значения T в количестве символов" -#: include/forms.inc.php:1287 include/views/js/item.preprocessing.js.php:157 +#: include/forms.inc.php:1323 include/views/js/item.preprocessing.js.php:157 msgid "list of characters" msgstr "список символов" -#: app/controllers/CControllerPopupTriggerExpr.php:721 +#: app/controllers/CControllerPopupTriggerExpr.php:722 msgid "log() - Natural logarithm" msgstr "log() - Натуральный логарифм" -#: app/controllers/CControllerPopupTriggerExpr.php:728 +#: app/controllers/CControllerPopupTriggerExpr.php:729 msgid "log10() - Decimal logarithm" msgstr "log10() - Обыкновенный логарифм" -#: app/controllers/CControllerPopupTriggerExpr.php:735 +#: app/controllers/CControllerPopupTriggerExpr.php:736 msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)" msgstr "logeventid() - Соответствие ID события последней записи журнала регулярному выражению V за период T (1 - соответствует, 0 - не соответствует)" -#: app/controllers/CControllerPopupTriggerExpr.php:742 +#: app/controllers/CControllerPopupTriggerExpr.php:743 msgid "logseverity() - Log severity of the last log entry for period T" msgstr "logseverity() - Важность журнала последней записи журнала за период T" -#: app/controllers/CControllerPopupTriggerExpr.php:749 +#: app/controllers/CControllerPopupTriggerExpr.php:750 msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)" msgstr "logsource() - Соответствие источника журнала последней записи журнала параметру V за период Е (1 - соответствует, 0 - не соответствует)" @@ -21431,7 +21418,7 @@ msgstr "logsource() - Соответствие источника журнала msgid "low-level discovery rule" msgstr "правило низкоуровневого обнаружения" -#: app/controllers/CControllerPopupTriggerExpr.php:756 +#: app/controllers/CControllerPopupTriggerExpr.php:757 msgid "ltrim() - Remove specified characters from the beginning of a string" msgstr "ltrim() - Удаление указанных символов с начала строки" @@ -21464,7 +21451,7 @@ msgstr "макрос пустой" msgid "macro(s)" msgstr "макрос(ы)" -#: app/controllers/CControllerPopupTriggerExpr.php:769 +#: app/controllers/CControllerPopupTriggerExpr.php:770 msgid "mad() - Median absolute deviation" msgstr "mad() - Абсолютное отклонение среднего" @@ -21491,7 +21478,7 @@ msgstr "совпадает" #: include/classes/api/services/CItemGeneral.php:1399 #: include/classes/graphdraw/CLineGraphDraw.php:1370 #: include/classes/graphdraw/CLineGraphDraw.php:1384 -#: include/classes/graphdraw/CPieGraphDraw.php:290 include/forms.inc.php:1312 +#: include/classes/graphdraw/CPieGraphDraw.php:290 include/forms.inc.php:1348 #: include/graphs.inc.php:78 #: include/views/js/configuration.graph.edit.js.php:68 #: include/views/js/configuration.graph.edit.js.php:144 @@ -21505,7 +21492,7 @@ msgstr "макс" msgid "max period is less than time filter default period" msgstr "макс. период меньше чем период фильтра времени по умолчанию" -#: app/controllers/CControllerPopupTriggerExpr.php:776 +#: app/controllers/CControllerPopupTriggerExpr.php:777 msgid "max() - Maximum value for period T" msgstr "max() - Максимальное значение за период Т" @@ -21514,12 +21501,12 @@ msgid "maximum dependent items count reached" msgstr "достигнуто максимальное количество зависимых элементов данных" #: include/classes/api/services/CItemGeneral.php:2396 -#: include/classes/import/CConfigurationImport.php:2801 -#: include/classes/import/CConfigurationImport.php:2868 +#: include/classes/import/CConfigurationImport.php:2761 +#: include/classes/import/CConfigurationImport.php:2828 msgid "maximum number of dependency levels reached" msgstr "достигнуто максимальное количество уровней зависимостей" -#: app/controllers/CControllerPopupTriggerExpr.php:783 +#: app/controllers/CControllerPopupTriggerExpr.php:784 msgid "mid() - Returns a substring beginning at the character position specified by start for N characters" msgstr "mid() - Возвращает подстроку, начиная с позиции символа, указанной с начала для N символов" @@ -21527,7 +21514,7 @@ msgstr "mid() - Возвращает подстроку, начиная с по #: include/classes/api/services/CItemGeneral.php:1399 #: include/classes/graphdraw/CLineGraphDraw.php:1368 #: include/classes/graphdraw/CLineGraphDraw.php:1381 -#: include/classes/graphdraw/CPieGraphDraw.php:286 include/forms.inc.php:1311 +#: include/classes/graphdraw/CPieGraphDraw.php:286 include/forms.inc.php:1347 #: include/graphs.inc.php:76 #: include/views/js/configuration.graph.edit.js.php:66 #: include/views/js/configuration.graph.edit.js.php:142 @@ -21537,25 +21524,25 @@ msgstr "mid() - Возвращает подстроку, начиная с по msgid "min" msgstr "мин" -#: app/controllers/CControllerPopupTriggerExpr.php:801 +#: app/controllers/CControllerPopupTriggerExpr.php:802 msgid "min() - Minimum value for period T" msgstr "min() - Минимальное значение за период Т" -#: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1322 +#: include/classes/api/services/CHost.php:1822 +#: include/classes/validators/CApiInputValidator.php:1330 #, c-format msgid "minimum length is %1$s characters" msgstr "минимальная длина %1$s символов" -#: app/controllers/CControllerPopupTriggerExpr.php:808 +#: app/controllers/CControllerPopupTriggerExpr.php:809 msgid "mod() - Division remainder" msgstr "mod() - Остаток от деления" -#: app/controllers/CControllerPopupTriggerExpr.php:821 +#: app/controllers/CControllerPopupTriggerExpr.php:822 msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)" msgstr "monodec() - Проверка постоянного уменьшения значения элемента данных (1 - данные монотонны, 0 - в противном случае), Режим (strict - требование строгой монотонности)" -#: app/controllers/CControllerPopupTriggerExpr.php:828 +#: app/controllers/CControllerPopupTriggerExpr.php:829 msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)" msgstr "monoinc() - Проверка постоянного увеличения значения элемента данных (1 - данные монотонны, 0 - в противном случае), Режим (strict - требование строгой монотонности)" @@ -21564,8 +21551,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "мс" -#: include/classes/validators/CApiInputValidator.php:2622 -#: include/classes/validators/CApiInputValidator.php:2700 +#: include/classes/validators/CApiInputValidator.php:2633 +#: include/classes/validators/CApiInputValidator.php:2711 #, c-format msgid "must be %1$s characters long" msgstr "должно быть %1$s символа" @@ -21586,8 +21573,8 @@ msgstr "должен быть длиной по крайней мере из %1$ msgid "must contain at least one digit" msgstr "должен содержать по крайней мере одну цифру" -#: include/classes/validators/CApiInputValidator.php:1526 -#: include/classes/validators/CApiInputValidator.php:1570 +#: include/classes/validators/CApiInputValidator.php:1534 +#: include/classes/validators/CApiInputValidator.php:1578 msgid "must contain at least one low-level discovery macro" msgstr "должно содержать по крайней мере один макрос низкоуровневого обнаружения" @@ -21647,6 +21634,11 @@ msgstr "новый" msgid "no data" msgstr "нет данных" +#: include/classes/api/services/CHostPrototype.php:1205 +#, c-format +msgid "no default interface for \"%1$s\" type." +msgstr "" + #: include/classes/api/services/CEvent.php:773 msgid "no permissions to acknowledge problems" msgstr "нет прав для подтверждения проблем" @@ -21671,7 +21663,7 @@ msgstr "нет прав создавать и редактировать кар msgid "no permissions to unacknowledge problems" msgstr "нет прав отменять подтверждение проблем" -#: app/controllers/CControllerPopupTriggerExpr.php:835 +#: app/controllers/CControllerPopupTriggerExpr.php:836 msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)" msgstr "nodata() - Отсутствие данных полученных за период времени T (1 - правда, 0 - ложь), Режим (strict - игнорировать задержку прокси при отправке данных)" @@ -21690,15 +21682,15 @@ msgstr "ожидался не пустая пара ключа и значени msgid "not in" msgstr "не в" -#: hostinventoriesoverview.php:146 include/forms.inc.php:912 +#: hostinventoriesoverview.php:146 include/forms.inc.php:948 msgid "not selected" msgstr "не выбрано" -#: app/controllers/CControllerPopupTriggerExpr.php:842 +#: app/controllers/CControllerPopupTriggerExpr.php:843 msgid "now() - Number of seconds since the Epoch" msgstr "now() - Количество секунд начиная с Epoch" -#: include/forms.inc.php:1279 include/views/js/item.preprocessing.js.php:149 +#: include/forms.inc.php:1315 include/views/js/item.preprocessing.js.php:149 msgid "number" msgstr "число" @@ -21707,7 +21699,7 @@ msgstr "число" msgid "of" msgstr "из" -#: app/views/administration.user.edit.php:327 +#: app/views/administration.user.edit.php:329 #: include/classes/setup/CFrontendSetup.php:238 #: include/classes/setup/CFrontendSetup.php:291 #: include/classes/setup/CFrontendSetup.php:308 @@ -21730,7 +21722,7 @@ msgstr "из" msgid "off" msgstr "выкл" -#: app/views/administration.user.edit.php:327 +#: app/views/administration.user.edit.php:329 #: include/classes/setup/CFrontendSetup.php:291 #: include/classes/setup/CFrontendSetup.php:308 #: include/classes/setup/CFrontendSetup.php:329 @@ -21762,11 +21754,11 @@ msgstr "или" msgid "other" msgstr "другое" -#: include/forms.inc.php:1305 include/views/js/item.preprocessing.js.php:179 +#: include/forms.inc.php:1341 include/views/js/item.preprocessing.js.php:179 msgid "output" msgstr "вывод" -#: include/classes/setup/CSetupWizard.php:522 +#: include/classes/setup/CSetupWizard.php:524 msgid "path/to/secret" msgstr "путь/к/секрету" @@ -21775,21 +21767,21 @@ msgid "path/to/secret:key" msgstr "путь/к/секрету:ключ" #: app/views/popup.httpstep.php:173 app/views/popup.lldoperation.php:76 -#: include/forms.inc.php:1304 include/forms.inc.php:1318 +#: include/forms.inc.php:1340 include/forms.inc.php:1354 #: include/views/js/item.preprocessing.js.php:178 #: include/views/js/item.preprocessing.js.php:193 msgid "pattern" msgstr "шаблон" -#: app/controllers/CControllerPopupTriggerExpr.php:848 +#: app/controllers/CControllerPopupTriggerExpr.php:849 msgid "percentile() - Percentile P of a period T" msgstr "percentile() - Процентиль P за период Т" -#: app/controllers/CControllerPopupTriggerExpr.php:855 +#: app/controllers/CControllerPopupTriggerExpr.php:856 msgid "pi() - Returns the Pi constant" msgstr "pi() - Возвращает Пи константу" -#: app/controllers/CControllerPopupTriggerExpr.php:860 +#: app/controllers/CControllerPopupTriggerExpr.php:861 msgid "power() - The power of a base value to a power value" msgstr "power() - Степень основного значения к значению степени" @@ -21797,15 +21789,15 @@ msgstr "power() - Степень основного значения к знач msgid "problem pattern" msgstr "шаблон проблем" -#: app/controllers/CControllerPopupTriggerExpr.php:873 +#: app/controllers/CControllerPopupTriggerExpr.php:874 msgid "radians() - Converts a value from degrees to radians" msgstr "radians() - Конвертация значения из градусов в радианы" -#: app/controllers/CControllerPopupTriggerExpr.php:880 +#: app/controllers/CControllerPopupTriggerExpr.php:881 msgid "rand() - A random integer value" msgstr "rand() - Случайное целое число" -#: app/controllers/CControllerPopupTriggerExpr.php:885 +#: app/controllers/CControllerPopupTriggerExpr.php:886 msgid "rate() - Returns per-second average rate for monotonically increasing counters" msgstr "rate() - Возвращает среднее изменение за секунду монотонно увеличивающихся счётчиков " @@ -21854,15 +21846,15 @@ msgstr "регулярное выражение" msgid "regular expression" msgstr "регулярное выражение" -#: app/controllers/CControllerPopupTriggerExpr.php:892 +#: app/controllers/CControllerPopupTriggerExpr.php:893 msgid "repeat() - Returns a string composed of value repeated count times" msgstr "repeat() - Возвращает строку состоящую из значений, которые повторяются указанное количество раз" -#: app/controllers/CControllerPopupTriggerExpr.php:905 +#: app/controllers/CControllerPopupTriggerExpr.php:906 msgid "replace() - Search value for occurrences of pattern, and replace with replacement" msgstr "replace() - Поиск шаблона, входящего в значение, и замена на заменитель" -#: include/forms.inc.php:1406 include/views/js/item.preprocessing.js.php:247 +#: include/forms.inc.php:1442 include/views/js/item.preprocessing.js.php:247 msgid "replacement" msgstr "замена" @@ -21882,15 +21874,15 @@ msgstr "выражает параметр уровня масштабирова msgid "right" msgstr "справа" -#: app/controllers/CControllerPopupTriggerExpr.php:923 +#: app/controllers/CControllerPopupTriggerExpr.php:924 msgid "right() - Returns the rightmost count characters" msgstr "right() - Возвращает количество самых правых символов" -#: app/controllers/CControllerPopupTriggerExpr.php:936 +#: app/controllers/CControllerPopupTriggerExpr.php:937 msgid "round() - Rounds a value to decimal places" msgstr "round() - Округление значение до десятичных знаков" -#: app/controllers/CControllerPopupTriggerExpr.php:949 +#: app/controllers/CControllerPopupTriggerExpr.php:950 msgid "rtrim() - Removes specified characters from the end of a string" msgstr "rtrim() - Удаление указанных символов с конца строки" @@ -21900,7 +21892,7 @@ msgid "s" msgstr "с" #: app/views/administration.mediatype.edit.php:220 -#: app/views/administration.script.edit.php:188 include/forms.inc.php:1330 +#: app/views/administration.script.edit.php:188 include/forms.inc.php:1366 #: include/views/configuration.host.discovery.edit.php:257 #: include/views/configuration.item.edit.php:313 #: include/views/configuration.item.prototype.edit.php:299 @@ -21908,7 +21900,7 @@ msgstr "с" msgid "script" msgstr "скрипт" -#: include/forms.inc.php:1405 include/views/js/item.preprocessing.js.php:246 +#: include/forms.inc.php:1441 include/views/js/item.preprocessing.js.php:246 msgid "search string" msgstr "строка поиска" @@ -21923,7 +21915,7 @@ msgstr "второй" msgid "second parameter is expected" msgstr "ожидается второй параметр" -#: include/forms.inc.php:1323 include/views/js/item.preprocessing.js.php:199 +#: include/forms.inc.php:1359 include/views/js/item.preprocessing.js.php:199 msgid "seconds" msgstr "секунды" @@ -21940,11 +21932,10 @@ msgid "short description" msgstr "краткое описание" #: include/classes/api/services/CAutoregistration.php:170 -#: include/classes/api/services/CHost.php:1811 -#: include/classes/api/services/CHost.php:1817 -#: include/classes/api/services/CHost.php:1826 -#: include/classes/api/services/CHost.php:1832 -#: include/classes/api/services/CHostPrototype.php:1720 +#: include/classes/api/services/CHost.php:1829 +#: include/classes/api/services/CHost.php:1835 +#: include/classes/api/services/CHost.php:1844 +#: include/classes/api/services/CHost.php:1850 #: include/classes/api/services/CHttpTest.php:983 #: include/classes/api/services/CHttpTest.php:1079 #: include/classes/api/services/CItemGeneral.php:495 @@ -21964,7 +21955,7 @@ msgstr "краткое описание" #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 -#: include/classes/validators/CApiInputValidator.php:1183 +#: include/classes/validators/CApiInputValidator.php:1186 msgid "should be empty" msgstr "должно быть пустым" @@ -21980,23 +21971,23 @@ msgstr "показать соответствия иконок" msgid "sign in as guest" msgstr "войти как гость" -#: app/controllers/CControllerPopupTriggerExpr.php:962 +#: app/controllers/CControllerPopupTriggerExpr.php:963 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive" msgstr "signum() - Возвращает -1 - если значение отрицательное, 0 - если значение ноль, 1 - если значение положительное" -#: app/controllers/CControllerPopupTriggerExpr.php:969 +#: app/controllers/CControllerPopupTriggerExpr.php:970 msgid "sin() - The sine of a value, where the value is an angle expressed in radians" msgstr "sin() - Синус значения, где само значение представляет собой угол, в радианах." -#: app/controllers/CControllerPopupTriggerExpr.php:976 +#: app/controllers/CControllerPopupTriggerExpr.php:977 msgid "sinh() - The hyperbolic sine of a value" msgstr "sinh() - Гиперболический синус значения" -#: app/controllers/CControllerPopupTriggerExpr.php:983 +#: app/controllers/CControllerPopupTriggerExpr.php:984 msgid "skewness() - Measures the asymmetry of the probability distribution" msgstr "skewness() - Измерение асимметрии распределения вероятностей" -#: app/controllers/CControllerPopupTriggerExpr.php:990 +#: app/controllers/CControllerPopupTriggerExpr.php:991 msgid "sqrt() - Square root of a value" msgstr "sqrt() - Квадратный корень значения" @@ -22004,11 +21995,11 @@ msgstr "sqrt() - Квадратный корень значения" msgid "standalone server" msgstr "автономный сервер" -#: app/controllers/CControllerPopupTriggerExpr.php:997 +#: app/controllers/CControllerPopupTriggerExpr.php:998 msgid "stddevpop() - Population standard deviation" msgstr "stddevpop() - Среднеквадратическое отклонение" -#: app/controllers/CControllerPopupTriggerExpr.php:1004 +#: app/controllers/CControllerPopupTriggerExpr.php:1005 msgid "stddevsamp() - Sample standard deviation" msgstr "stddevsamp() - Выборочное среднеквадратическое отклонение" @@ -22016,11 +22007,11 @@ msgstr "stddevsamp() - Выборочное среднеквадратическ msgid "sum" msgstr "сумма" -#: app/controllers/CControllerPopupTriggerExpr.php:1011 +#: app/controllers/CControllerPopupTriggerExpr.php:1012 msgid "sum() - Sum of values of a period T" msgstr "sum() - Сумма значений за период Т" -#: app/controllers/CControllerPopupTriggerExpr.php:1018 +#: app/controllers/CControllerPopupTriggerExpr.php:1019 msgid "sumofsquares() - The sum of squares" msgstr "sumofsquares() - Сумма квадратов" @@ -22043,23 +22034,23 @@ msgstr "заданная учётная запись не уникальна" #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 #: include/classes/widgets/CWidgetHelper.php:676 -#: include/classes/widgets/CWidgetHelper.php:720 include/forms.inc.php:2031 +#: include/classes/widgets/CWidgetHelper.php:720 include/forms.inc.php:2067 #: include/views/configuration.maintenance.edit.php:174 #: include/views/js/configuration.maintenance.edit.js.php:30 #: include/views/js/configuration.maintenance.edit.js.php:60 msgid "tag" msgstr "тег" -#: app/controllers/CControllerPopupTriggerExpr.php:1025 +#: app/controllers/CControllerPopupTriggerExpr.php:1026 msgid "tan() - The tangent of a value" msgstr "tan() - Тангенс значения" -#: include/classes/api/services/CHostBase.php:959 +#: include/classes/api/services/CHostBase.php:1076 #, c-format msgid "template ID \"%1$s\" is passed %2$s times" msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз" -#: include/classes/validators/CApiInputValidator.php:2802 +#: include/classes/validators/CApiInputValidator.php:2813 msgid "the last new line feed is missing" msgstr "последний перевод на новую строку отсутствует" @@ -22067,16 +22058,12 @@ msgstr "последний перевод на новую строку отсу #: app/controllers/CControllerDashboardUpdate.php:201 #: app/controllers/CControllerDashboardUpdate.php:213 #: include/classes/api/services/CAutoregistration.php:157 -#: include/classes/api/services/CDiscoveryRule.php:1647 -#: include/classes/api/services/CDiscoveryRule.php:2008 -#: include/classes/api/services/CDiscoveryRule.php:2016 -#: include/classes/api/services/CHostBase.php:1417 -#: include/classes/api/services/CHost.php:1907 -#: include/classes/api/services/CHost.php:2140 -#: include/classes/api/services/CHostPrototype.php:1664 -#: include/classes/api/services/CHostPrototype.php:1676 -#: include/classes/api/services/CHostPrototype.php:1692 -#: include/classes/api/services/CHostPrototype.php:1704 +#: include/classes/api/services/CDiscoveryRule.php:1650 +#: include/classes/api/services/CDiscoveryRule.php:2011 +#: include/classes/api/services/CDiscoveryRule.php:2019 +#: include/classes/api/services/CHostBase.php:1541 +#: include/classes/api/services/CHost.php:1925 +#: include/classes/api/services/CHost.php:2158 #: include/classes/api/services/CHttpTest.php:744 #: include/classes/api/services/CProxy.php:708 #: include/classes/api/services/CProxy.php:719 @@ -22090,7 +22077,7 @@ msgstr "последний перевод на новую строку отсу #: include/classes/helpers/CDashboardHelper.php:420 #: include/classes/helpers/CDashboardHelper.php:428 #: include/classes/helpers/CDashboardHelper.php:438 -#: include/classes/validators/CApiInputValidator.php:1250 +#: include/classes/validators/CApiInputValidator.php:1258 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "параметр \"%1$s\" отсутствует" @@ -22108,6 +22095,7 @@ msgstr "таблица \"%1$s\" не найдена" #: include/classes/import/validators/C52XmlValidator.php:2223 #: include/classes/import/validators/C54XmlValidator.php:2278 #: include/classes/import/validators/C60XmlValidator.php:2280 +#: include/classes/import/validators/C62XmlValidator.php:2280 #: include/classes/import/validators/CXmlValidatorGeneral.php:183 #: include/classes/import/validators/CXmlValidatorGeneral.php:202 #, c-format @@ -22131,35 +22119,35 @@ msgstr "период времени фильтра по умолчанию пр msgid "time shift" msgstr "сдвиг времени" -#: app/controllers/CControllerPopupTriggerExpr.php:1032 +#: app/controllers/CControllerPopupTriggerExpr.php:1033 msgid "time() - Current time" msgstr "time() - Текущее время" -#: app/controllers/CControllerPopupTriggerExpr.php:1038 +#: app/controllers/CControllerPopupTriggerExpr.php:1039 msgid "timeleft() - Time to reach threshold estimated based on period T" msgstr "timeleft() - Время достижения порога вычисленное на основе периода Т" -#: app/controllers/CControllerPopupTriggerExpr.php:1045 +#: app/controllers/CControllerPopupTriggerExpr.php:1046 msgid "trendavg() - Average value of a period T with exact period shift" msgstr "trendavg() - Среднее значение за период Т с точным сдвигом периода" -#: app/controllers/CControllerPopupTriggerExpr.php:1066 +#: app/controllers/CControllerPopupTriggerExpr.php:1067 msgid "trendcount() - Number of successfully retrieved values for period T" msgstr "trendcount() - Количество успешно полученных значений за период Т" -#: app/controllers/CControllerPopupTriggerExpr.php:1073 +#: app/controllers/CControllerPopupTriggerExpr.php:1074 msgid "trendmax() - Maximum value for period T with exact period shift" msgstr "trendmax() - Максимальное значение за период Т с точным сдвигом периода" -#: app/controllers/CControllerPopupTriggerExpr.php:1080 +#: app/controllers/CControllerPopupTriggerExpr.php:1081 msgid "trendmin() - Minimum value for period T with exact period shift" msgstr "trendmin() - Минимальное значение за период Т с точным сдвигом периода" -#: app/controllers/CControllerPopupTriggerExpr.php:1087 +#: app/controllers/CControllerPopupTriggerExpr.php:1088 msgid "trendstl() - Anomaly detection for period T" msgstr "trendstl() - Обнаружение аномалии за период T" -#: app/controllers/CControllerPopupTriggerExpr.php:1130 +#: app/controllers/CControllerPopupTriggerExpr.php:1131 msgid "trendsum() - Sum of values of a period T with exact period shift" msgstr "trendsum() - Сумма значений за период Т с точным сдвигом периода" @@ -22177,19 +22165,19 @@ msgstr "триггер не позволяет ручное закрытие" msgid "trigger expression must contain at least one /host/key reference" msgstr "выражение триггера должно содержать по крайней мере одну ссылку /узел сети/ключ" -#: include/classes/api/services/CTriggerGeneral.php:1722 +#: include/classes/api/services/CTriggerGeneral.php:1723 msgid "trigger prototype cannot be moved to another template or host" msgstr "прототип триггера нельзя переместить в другой шаблон или узел сети" -#: include/classes/api/services/CTriggerGeneral.php:1888 +#: include/classes/api/services/CTriggerGeneral.php:1889 msgid "trigger with linkages cannot be moved to another template or host" msgstr "триггер со связями нельзя переместить в другой шаблон или узел сети" -#: app/controllers/CControllerPopupTriggerExpr.php:1137 +#: app/controllers/CControllerPopupTriggerExpr.php:1138 msgid "trim() - Remove specified characters from the beginning and the end of a string" msgstr "trim() - Удаление указанных символов с начала и конца строки" -#: app/controllers/CControllerPopupTriggerExpr.php:1150 +#: app/controllers/CControllerPopupTriggerExpr.php:1151 msgid "truncate() - Truncates a value to decimal places" msgstr "truncate() - Усечение значения до десятичных знаков" @@ -22198,7 +22186,7 @@ msgstr "truncate() - Усечение значения до десятичных msgid "type here to search" msgstr "начните печатать для поиска" -#: include/classes/validators/CApiInputValidator.php:2204 +#: include/classes/validators/CApiInputValidator.php:2215 msgid "unacceptable URL" msgstr "неприемлемый URL" @@ -22217,6 +22205,7 @@ msgstr "неожиданная константа \"%1$s\"" #: include/classes/import/validators/C52XmlValidator.php:2455 #: include/classes/import/validators/C54XmlValidator.php:2510 #: include/classes/import/validators/C60XmlValidator.php:2512 +#: include/classes/import/validators/C62XmlValidator.php:2512 #, c-format msgid "unexpected constant value \"%1$s\"" msgstr "неожиданное значение константы \"%1$s\"" @@ -22233,14 +22222,13 @@ msgstr "неожиданный конец ключа" msgid "unexpected end of macro" msgstr "неожиданное завершение макроса" -#: include/classes/api/services/CDiscoveryRule.php:1667 -#: include/classes/api/services/CDiscoveryRule.php:1699 -#: include/classes/api/services/CDiscoveryRule.php:1722 -#: include/classes/api/services/CDiscoveryRule.php:1741 +#: include/classes/api/services/CDiscoveryRule.php:1670 +#: include/classes/api/services/CDiscoveryRule.php:1702 +#: include/classes/api/services/CDiscoveryRule.php:1725 +#: include/classes/api/services/CDiscoveryRule.php:1744 #: include/classes/api/services/CGraphGeneral.php:627 #: include/classes/api/services/CGraphGeneral.php:749 -#: include/classes/api/services/CHostPrototype.php:325 -#: include/classes/api/services/CHostPrototype.php:1710 +#: include/classes/api/services/CHostPrototype.php:1053 #: include/classes/api/services/CHttpTest.php:372 #: include/classes/api/services/CHttpTest.php:515 #: include/classes/api/services/CHttpTest.php:539 @@ -22249,8 +22237,8 @@ msgstr "неожиданное завершение макроса" #: include/classes/api/services/CScript.php:910 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1189 -#: include/classes/validators/CApiInputValidator.php:1204 +#: include/classes/validators/CApiInputValidator.php:1192 +#: include/classes/validators/CApiInputValidator.php:3017 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "неожиданный параметр \"%1$s\"" @@ -22270,8 +22258,8 @@ msgstr "неожиданный текст \"%1$s\"" #: include/classes/api/services/CEvent.php:744 #: include/classes/api/services/CEvent.php:878 -#: include/classes/api/services/CHost.php:1766 -#: include/classes/api/services/CHost.php:1772 +#: include/classes/api/services/CHost.php:1784 +#: include/classes/api/services/CHost.php:1790 #: include/classes/api/services/CItemGeneral.php:1271 #: include/classes/api/services/CItemGeneral.php:1668 #: include/classes/api/services/CItemGeneral.php:1694 @@ -22306,7 +22294,7 @@ msgstr "неподдерживаемый суффикс времени" msgid "unsupported version number" msgstr "неподдерживаемый номер версии" -#: include/classes/validators/CApiInputValidator.php:506 +#: include/classes/validators/CApiInputValidator.php:509 msgid "uppercase identifier expected" msgstr "ожидается идентификатор в верхнем регистре" @@ -22336,7 +22324,7 @@ msgstr "ожидается идентификатор в верхнем реги #: include/classes/widgets/CWidgetHelper.php:736 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:172 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:244 -#: include/forms.inc.php:1357 include/forms.inc.php:2036 +#: include/forms.inc.php:1393 include/forms.inc.php:2072 #: include/views/configuration.host.discovery.edit.php:208 #: include/views/configuration.host.discovery.edit.php:365 #: include/views/configuration.item.edit.php:264 @@ -22352,16 +22340,16 @@ msgstr "ожидается идентификатор в верхнем реги msgid "value" msgstr "значение" -#: include/classes/api/services/CDiscoveryRule.php:1887 +#: include/classes/api/services/CDiscoveryRule.php:1890 #, c-format msgid "value \"%1$s\" already exists" msgstr "значение \"%1$s\" уже существует" #: include/classes/import/CConfigurationImport.php:843 #: include/classes/import/CConfigurationImport.php:880 -#: include/classes/import/CConfigurationImport.php:2697 -#: include/classes/import/CConfigurationImport.php:2811 -#: include/classes/import/CConfigurationImport.php:2862 +#: include/classes/import/CConfigurationImport.php:2657 +#: include/classes/import/CConfigurationImport.php:2771 +#: include/classes/import/CConfigurationImport.php:2822 #, c-format msgid "value \"%1$s\" not found" msgstr "значение \"%1$s\" не найдено" @@ -22370,50 +22358,50 @@ msgstr "значение \"%1$s\" не найдено" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1977 -#: include/classes/validators/CApiInputValidator.php:2067 +#: include/classes/validators/CApiInputValidator.php:1985 +#: include/classes/validators/CApiInputValidator.php:2075 #, c-format msgid "value %1$s already exists" msgstr "значение %1$s уже существует" -#: include/classes/api/services/CTriggerGeneral.php:1773 -#: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:386 -#: include/classes/validators/CApiInputValidator.php:470 -#: include/classes/validators/CApiInputValidator.php:501 -#: include/classes/validators/CApiInputValidator.php:595 -#: include/classes/validators/CApiInputValidator.php:1032 -#: include/classes/validators/CApiInputValidator.php:1334 -#: include/classes/validators/CApiInputValidator.php:1464 -#: include/classes/validators/CApiInputValidator.php:1510 -#: include/classes/validators/CApiInputValidator.php:1553 -#: include/classes/validators/CApiInputValidator.php:1607 -#: include/classes/validators/CApiInputValidator.php:1682 -#: include/classes/validators/CApiInputValidator.php:1725 -#: include/classes/validators/CApiInputValidator.php:1799 -#: include/classes/validators/CApiInputValidator.php:1831 -#: include/classes/validators/CApiInputValidator.php:1865 -#: include/classes/validators/CApiInputValidator.php:1911 -#: include/classes/validators/CApiInputValidator.php:2162 -#: include/classes/validators/CApiInputValidator.php:2194 -#: include/classes/validators/CApiInputValidator.php:2236 -#: include/classes/validators/CApiInputValidator.php:2281 -#: include/classes/validators/CApiInputValidator.php:2324 -#: include/classes/validators/CApiInputValidator.php:2373 -#: include/classes/validators/CApiInputValidator.php:2426 -#: include/classes/validators/CApiInputValidator.php:2470 -#: include/classes/validators/CApiInputValidator.php:2590 -#: include/classes/validators/CApiInputValidator.php:2730 -#: include/classes/validators/CApiInputValidator.php:2797 -#: include/classes/validators/CApiInputValidator.php:2827 +#: include/classes/api/services/CTriggerGeneral.php:1774 +#: include/classes/api/services/CTriggerGeneral.php:1794 +#: include/classes/validators/CApiInputValidator.php:389 +#: include/classes/validators/CApiInputValidator.php:473 +#: include/classes/validators/CApiInputValidator.php:504 +#: include/classes/validators/CApiInputValidator.php:598 +#: include/classes/validators/CApiInputValidator.php:1035 +#: include/classes/validators/CApiInputValidator.php:1342 +#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:1518 +#: include/classes/validators/CApiInputValidator.php:1561 +#: include/classes/validators/CApiInputValidator.php:1615 +#: include/classes/validators/CApiInputValidator.php:1690 +#: include/classes/validators/CApiInputValidator.php:1733 +#: include/classes/validators/CApiInputValidator.php:1807 +#: include/classes/validators/CApiInputValidator.php:1839 +#: include/classes/validators/CApiInputValidator.php:1873 +#: include/classes/validators/CApiInputValidator.php:1919 +#: include/classes/validators/CApiInputValidator.php:2173 +#: include/classes/validators/CApiInputValidator.php:2205 +#: include/classes/validators/CApiInputValidator.php:2247 +#: include/classes/validators/CApiInputValidator.php:2292 +#: include/classes/validators/CApiInputValidator.php:2335 +#: include/classes/validators/CApiInputValidator.php:2384 +#: include/classes/validators/CApiInputValidator.php:2437 +#: include/classes/validators/CApiInputValidator.php:2481 +#: include/classes/validators/CApiInputValidator.php:2601 +#: include/classes/validators/CApiInputValidator.php:2741 +#: include/classes/validators/CApiInputValidator.php:2808 +#: include/classes/validators/CApiInputValidator.php:2838 msgid "value is too long" msgstr "значение слишком длинное" #: include/classes/api/services/CReport.php:207 #: include/classes/api/services/CReport.php:603 -#: include/classes/validators/CApiInputValidator.php:576 -#: include/classes/validators/CApiInputValidator.php:918 -#: include/classes/validators/CApiInputValidator.php:2942 +#: include/classes/validators/CApiInputValidator.php:579 +#: include/classes/validators/CApiInputValidator.php:921 +#: include/classes/validators/CApiInputValidator.php:2953 #, c-format msgid "value must be %1$s" msgid_plural "value must be one of %1$s" @@ -22422,16 +22410,16 @@ msgstr[1] "значение должно быть одно из %1$s" msgstr[2] "значение должно быть одно из %1$s" #: include/classes/validators/CActionCondValidator.php:171 -#: include/classes/validators/CApiInputValidator.php:2555 +#: include/classes/validators/CApiInputValidator.php:2566 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "значение должно быть между \"%1$s\" и \"%2$s\"" -#: include/classes/validators/CApiInputValidator.php:586 +#: include/classes/validators/CApiInputValidator.php:589 msgid "value must be empty" msgstr "значение должно быть пустым" -#: include/classes/validators/CApiInputValidator.php:581 +#: include/classes/validators/CApiInputValidator.php:584 #, c-format msgid "value must be empty or %1$s" msgid_plural "value must be empty or one of %1$s" @@ -22450,14 +22438,14 @@ msgid "value must be no less than \"%1$s\"" msgstr "значение должно быть не меньше чем \"%1$s\"" #: app/controllers/CControllerPopupHttpStep.php:101 -#: include/classes/api/services/CDiscoveryRule.php:1680 -#: include/classes/api/services/CDiscoveryRule.php:1711 -#: include/classes/api/services/CDiscoveryRule.php:1731 -#: include/classes/api/services/CDiscoveryRule.php:1753 +#: include/classes/api/services/CDiscoveryRule.php:1683 +#: include/classes/api/services/CDiscoveryRule.php:1714 +#: include/classes/api/services/CDiscoveryRule.php:1734 +#: include/classes/api/services/CDiscoveryRule.php:1756 #: include/classes/api/services/CEvent.php:780 #: include/classes/api/services/CHost.php:923 -#: include/classes/api/services/CHost.php:1969 -#: include/classes/api/services/CHost.php:2167 +#: include/classes/api/services/CHost.php:1987 +#: include/classes/api/services/CHost.php:2185 #: include/classes/api/services/CMapElement.php:86 #: include/classes/api/services/CMap.php:683 #: include/classes/api/services/CMap.php:689 @@ -22468,13 +22456,14 @@ msgstr "значение должно быть не меньше чем \"%1$s\" #: include/classes/import/validators/C52XmlValidator.php:2574 #: include/classes/import/validators/C54XmlValidator.php:2587 #: include/classes/import/validators/C60XmlValidator.php:2589 +#: include/classes/import/validators/C62XmlValidator.php:2589 #: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "значение должно быть одно из %1$s" -#: include/classes/validators/CApiInputValidator.php:944 +#: include/classes/validators/CApiInputValidator.php:947 #, c-format msgid "value must be within the range of %1$s" msgstr "значение должно быть в диапазоне %1$s" @@ -22496,11 +22485,11 @@ msgstr "значение второго параметра слишком дли msgid "value of third parameter must be one of %1$s" msgstr "значением третьего параметра должно быть %1$s" -#: app/controllers/CControllerPopupTriggerExpr.php:1163 +#: app/controllers/CControllerPopupTriggerExpr.php:1164 msgid "varpop() - Population variance" msgstr "varpop() - Дисперсия генеральной совокупности" -#: app/controllers/CControllerPopupTriggerExpr.php:1170 +#: app/controllers/CControllerPopupTriggerExpr.php:1171 msgid "varsamp() - Sample variance" msgstr "varsamp() - Выборочная дисперсия" @@ -22522,7 +22511,7 @@ msgctxt "year short" msgid "y" msgstr "г" -#: include/classes/validators/CApiInputValidator.php:2842 +#: include/classes/validators/CApiInputValidator.php:2853 #, c-format msgid "zoom level must be between \"%1$s\" and \"%2$s\"" msgstr "уровень масштаба должен быть между \"%1$s\" и \"%2$s\"" |