diff options
Diffstat (limited to 'frontends/php/locale/ru/LC_MESSAGES/frontend.po')
| -rw-r--r-- | frontends/php/locale/ru/LC_MESSAGES/frontend.po | 2373 |
1 files changed, 1185 insertions, 1188 deletions
diff --git a/frontends/php/locale/ru/LC_MESSAGES/frontend.po b/frontends/php/locale/ru/LC_MESSAGES/frontend.po index 93d4d0f79d3..a790676b07b 100644 --- a/frontends/php/locale/ru/LC_MESSAGES/frontend.po +++ b/frontends/php/locale/ru/LC_MESSAGES/frontend.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-13 23:40+0200\n" -"PO-Revision-Date: 2018-09-28 11:24+0300\n" +"POT-Creation-Date: 2019-02-03 01:45+0200\n" +"PO-Revision-Date: 2019-02-03 00:51+0300\n" "Last-Translator: Alexey <dotneft@gmail.com>\n" "Language-Team: Zabbix translation team\n" "Language: ru\n" @@ -13,7 +13,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.5.1.3\n" "X-Poedit-Basepath: ../../\n" -"X-POOTLE-MTIME: 1538126671.000000\n" +"X-POOTLE-MTIME: 1549147899.000000\n" #: include/classes/import/validators/C10XmlValidator.php:358 #: include/classes/import/validators/C10XmlValidator.php:375 @@ -22,15 +22,15 @@ msgstr "" #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 #, c-format msgid "\"%1$s\" is expected" msgstr "\"%1$s\" ожидалось" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #, c-format msgid "\"%1$s\" value must be less than or equal to \"%2$s\" value" -msgstr "" +msgstr "Значение \"%1$s\" должно быть меньше или равно \"%2$s\" значению" #: include/classes/api/services/CMaintenance.php:353 #: include/classes/api/services/CMaintenance.php:358 @@ -47,6 +47,13 @@ msgstr "\"%s\" должно быть между 1970.01.01 и 2038.01.18." msgid "\"host:key\" pair is expected" msgstr "ожидается пара \"узел сети:ключ\"" +#: include/forms.inc.php:1475 +#: include/views/configuration.host.discovery.edit.php:714 +#: include/views/js/configuration.host.discovery.edit.js.php:52 +#: include/views/js/item.preprocessing.js.php:162 +msgid "$.path.to.node" +msgstr "$.путь.к.ноде" + #: include/classes/api/services/CDRule.php:520 #, c-format msgid "%1$d characters exceeds maximum length of %2$d characters" @@ -88,7 +95,7 @@ msgstr[0] "%1$s элемент данных" msgstr[1] "%1$s элемента данных" msgstr[2] "%1$s элементов данных" -#: include/classes/api/services/CItemGeneral.php:2227 +#: include/classes/api/services/CItemGeneral.php:2190 #: include/classes/import/readers/CXmlImportReader.php:46 #, c-format msgid "%1$s [Line: %2$s | Column: %3$s]" @@ -315,11 +322,11 @@ msgstr "<подменю/подменю/...>скрипт" msgid "ADD OVERRIDE" msgstr "ДОБАВЛЕНИЕ ЗАМЕЩЕНИЯ" -#: include/views/configuration.host.discovery.edit.php:439 -#: include/views/configuration.item.edit.php:565 -#: include/views/configuration.item.edit.php:572 -#: include/views/configuration.item.massupdate.php:248 -#: include/views/configuration.item.prototype.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:427 +#: include/views/configuration.item.edit.php:551 +#: include/views/configuration.item.edit.php:558 +#: include/views/configuration.item.massupdate.php:239 +#: include/views/configuration.item.prototype.edit.php:504 #: include/views/configuration.item.prototype.massupdate.php:235 #: include/views/js/configuration.discovery.edit.js.php:113 msgid "AES" @@ -391,6 +398,7 @@ msgstr "Подтвержденные РЕШЁННЫЕ события" #: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:80 #: include/actions.inc.php:1910 include/actions.inc.php:1994 #: include/audit.inc.php:29 include/classes/screens/CScreenActions.php:127 +#: include/forms.inc.php:1402 #: include/views/administration.auditacts.list.php:57 #: include/views/administration.auditlogs.list.php:42 #: include/views/administration.auditlogs.list.php:74 @@ -418,19 +426,15 @@ msgstr "Подтвержденные РЕШЁННЫЕ события" #: include/views/configuration.correlation.edit.php:48 #: include/views/configuration.correlation.edit.php:218 #: include/views/configuration.graph.edit.php:346 -#: include/views/configuration.host.discovery.edit.php:518 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:506 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/configuration.host.edit.php:546 #: include/views/configuration.host.prototype.edit.php:255 #: include/views/configuration.httpconf.edit.php:202 -#: include/views/configuration.item.edit.php:700 -#: include/views/configuration.item.edit.php:941 -#: include/views/configuration.item.massupdate.php:344 -#: include/views/configuration.item.massupdate.php:458 -#: include/views/configuration.item.prototype.edit.php:629 -#: include/views/configuration.item.prototype.edit.php:774 -#: include/views/configuration.item.prototype.massupdate.php:321 -#: include/views/configuration.item.prototype.massupdate.php:436 +#: include/views/configuration.item.edit.php:687 +#: include/views/configuration.item.massupdate.php:340 +#: include/views/configuration.item.prototype.edit.php:616 +#: include/views/configuration.item.prototype.massupdate.php:336 #: include/views/configuration.maintenance.edit.php:77 #: include/views/configuration.services.edit.php:117 #: include/views/configuration.services.edit.php:170 @@ -567,7 +571,7 @@ msgstr "Активно до" #: app/views/popup.httpstep.php:161 app/views/popup.media.php:48 #: app/views/popup.media.php:112 app/views/popup.triggerwizard.php:169 #: app/views/popup.triggerwizard.php:195 -#: include/classes/widgets/CWidgetHelper.php:420 +#: include/classes/widgets/CWidgetHelper.php:420 include/forms.inc.php:1615 #: include/views/administration.auditlogs.list.php:46 #: include/views/administration.general.iconmap.edit.php:101 #: include/views/administration.general.iconmap.edit.php:142 @@ -602,11 +606,12 @@ msgstr "Активно до" #: include/views/configuration.discovery.edit.php:118 #: include/views/configuration.graph.edit.php:390 #: include/views/configuration.graph.edit.php:473 -#: include/views/configuration.host.discovery.edit.php:114 -#: include/views/configuration.host.discovery.edit.php:209 -#: include/views/configuration.host.discovery.edit.php:554 -#: include/views/configuration.host.discovery.edit.php:674 -#: include/views/configuration.host.discovery.edit.php:713 +#: include/views/configuration.host.discovery.edit.php:113 +#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:542 +#: include/views/configuration.host.discovery.edit.php:662 +#: include/views/configuration.host.discovery.edit.php:727 +#: include/views/configuration.host.discovery.edit.php:775 #: include/views/configuration.host.edit.php:116 #: include/views/configuration.host.edit.php:132 #: include/views/configuration.host.edit.php:148 @@ -620,25 +625,21 @@ msgstr "Активно до" #: include/views/configuration.httpconf.edit.php:128 #: include/views/configuration.httpconf.edit.php:268 #: include/views/configuration.httpconf.edit.php:310 -#: include/views/configuration.item.edit.php:146 -#: include/views/configuration.item.edit.php:241 -#: include/views/configuration.item.edit.php:749 -#: include/views/configuration.item.edit.php:1148 -#: include/views/configuration.item.edit.php:1195 -#: include/views/configuration.item.massupdate.php:158 -#: include/views/configuration.item.massupdate.php:430 -#: include/views/configuration.item.massupdate.php:496 -#: include/views/configuration.item.massupdate.php:610 -#: include/views/configuration.item.prototype.edit.php:134 -#: include/views/configuration.item.prototype.edit.php:229 -#: include/views/configuration.item.prototype.edit.php:665 -#: include/views/configuration.item.prototype.edit.php:981 -#: include/views/configuration.item.prototype.edit.php:1014 +#: include/views/configuration.item.edit.php:148 +#: include/views/configuration.item.edit.php:240 +#: include/views/configuration.item.edit.php:736 +#: include/views/configuration.item.edit.php:957 +#: include/views/configuration.item.massupdate.php:156 +#: include/views/configuration.item.massupdate.php:378 +#: include/views/configuration.item.massupdate.php:492 +#: include/views/configuration.item.prototype.edit.php:133 +#: include/views/configuration.item.prototype.edit.php:225 +#: include/views/configuration.item.prototype.edit.php:652 +#: include/views/configuration.item.prototype.edit.php:779 #: include/views/configuration.item.prototype.massupdate.php:152 -#: include/views/configuration.item.prototype.massupdate.php:407 -#: include/views/configuration.item.prototype.massupdate.php:474 -#: include/views/configuration.item.prototype.massupdate.php:566 -#: include/views/configuration.item.prototype.massupdate.php:641 +#: include/views/configuration.item.prototype.massupdate.php:374 +#: include/views/configuration.item.prototype.massupdate.php:466 +#: include/views/configuration.item.prototype.massupdate.php:541 #: include/views/configuration.maintenance.edit.php:137 #: include/views/configuration.maintenance.edit.php:224 #: include/views/configuration.maintenance.edit.php:295 @@ -920,11 +921,11 @@ msgstr "Все шаблоны" msgid "Allow manual close" msgstr "Разрешить закрывать вручную" -#: include/views/configuration.host.discovery.edit.php:576 -#: include/views/configuration.item.edit.php:852 -#: include/views/configuration.item.massupdate.php:575 -#: include/views/configuration.item.prototype.edit.php:721 -#: include/views/configuration.item.prototype.massupdate.php:556 +#: include/views/configuration.host.discovery.edit.php:565 +#: include/views/configuration.item.edit.php:837 +#: include/views/configuration.item.massupdate.php:457 +#: include/views/configuration.item.prototype.edit.php:710 +#: include/views/configuration.item.prototype.massupdate.php:456 msgid "Allowed hosts" msgstr "Разрешенные хосты" @@ -936,7 +937,7 @@ msgstr "В качестве альтернативы, вы можете уста #: include/views/configuration.action.edit.php:112 #: include/views/configuration.action.edit.php:1150 #: include/views/configuration.correlation.edit.php:94 -#: include/views/configuration.host.discovery.edit.php:598 +#: include/views/configuration.host.discovery.edit.php:586 #: include/views/configuration.trigger.prototype.edit.php:130 #: include/views/configuration.trigger.prototype.edit.php:322 #: include/views/configuration.triggers.edit.php:151 @@ -950,7 +951,7 @@ msgstr "И" #: include/views/configuration.action.edit.php:111 #: include/views/configuration.action.edit.php:1149 #: include/views/configuration.correlation.edit.php:93 -#: include/views/configuration.host.discovery.edit.php:597 +#: include/views/configuration.host.discovery.edit.php:585 #: include/views/configuration.maintenance.edit.php:170 #: include/views/configuration.triggers.list.php:73 msgid "And/Or" @@ -1013,8 +1014,8 @@ msgid "Application error." msgstr "Ошибка приложения." #: app/controllers/CControllerPopupGeneric.php:136 -#: include/views/configuration.item.prototype.edit.php:751 -#: include/views/configuration.item.prototype.massupdate.php:637 +#: include/views/configuration.item.prototype.edit.php:741 +#: include/views/configuration.item.prototype.massupdate.php:537 msgid "Application prototypes" msgstr "Прототипы групп элементов данных" @@ -1041,12 +1042,12 @@ msgstr "Группа элементов данных с applicationid \"%1$s\" #: include/views/configuration.host.edit.php:304 #: include/views/configuration.host.list.php:129 #: include/views/configuration.host.list.php:320 -#: include/views/configuration.item.edit.php:887 +#: include/views/configuration.item.edit.php:872 #: include/views/configuration.item.list.php:70 -#: include/views/configuration.item.massupdate.php:636 -#: include/views/configuration.item.prototype.edit.php:736 +#: include/views/configuration.item.massupdate.php:518 +#: include/views/configuration.item.prototype.edit.php:726 #: include/views/configuration.item.prototype.list.php:58 -#: include/views/configuration.item.prototype.massupdate.php:562 +#: include/views/configuration.item.prototype.massupdate.php:462 #: include/views/configuration.template.edit.php:130 #: include/views/configuration.template.list.php:86 #: include/views/configuration.template.list.php:184 @@ -1079,7 +1080,7 @@ msgstr "Близится" msgid "Apr" msgstr "Апр." -#: include/forms.inc.php:1980 include/func.inc.php:119 +#: include/forms.inc.php:2228 include/func.inc.php:119 #: include/func.inc.php:256 jsLoader.php:136 msgid "April" msgstr "Апрель" @@ -1104,16 +1105,16 @@ msgstr "Размер области" msgid "Area type" msgstr "Тип области" -#: include/items.inc.php:1742 +#: include/items.inc.php:1736 msgid "Arithmetic" msgstr "Арифметические" -#: include/views/configuration.item.edit.php:822 -#: include/views/configuration.item.edit.php:828 -#: include/views/configuration.item.massupdate.php:551 -#: include/views/configuration.item.prototype.edit.php:701 -#: include/views/configuration.item.prototype.edit.php:707 -#: include/views/configuration.item.prototype.massupdate.php:532 +#: include/views/configuration.item.edit.php:807 +#: include/views/configuration.item.edit.php:813 +#: include/views/configuration.item.massupdate.php:434 +#: include/views/configuration.item.prototype.edit.php:688 +#: include/views/configuration.item.prototype.edit.php:694 +#: include/views/configuration.item.prototype.massupdate.php:432 msgid "As is" msgstr "Как есть" @@ -1151,7 +1152,7 @@ msgstr "В %1$s:%2$s %3$s %4$s каждый %5$s" msgid "At %1$s:%2$s on day %3$s of every %4$s" msgstr "В %1$s:%2$s на %3$s день каждый %4$s" -#: include/forms.inc.php:2098 +#: include/forms.inc.php:2346 msgid "At (hour:minute)" msgstr "В (час:минута)" @@ -1234,13 +1235,13 @@ msgstr "Журнал аудита" msgid "Aug" msgstr "Авг" -#: include/forms.inc.php:1967 include/func.inc.php:123 +#: include/forms.inc.php:2215 include/func.inc.php:123 #: include/func.inc.php:260 jsLoader.php:140 msgid "August" msgstr "Август" -#: app/views/administration.authentication.edit.php:127 -#: app/views/administration.authentication.edit.php:135 +#: app/views/administration.authentication.edit.php:137 +#: app/views/administration.authentication.edit.php:145 #: app/views/administration.mediatype.edit.php:89 include/menu.inc.php:265 #: include/views/configuration.httpconf.edit.php:283 #: include/views/configuration.httpconf.list.php:92 @@ -1260,37 +1261,37 @@ msgstr "Ошибка при аутентификации: %1$s." #: include/views/configuration.action.edit.php:948 #: include/views/configuration.action.edit.php:1735 #: include/views/configuration.action.edit.php:2193 -#: include/views/configuration.host.discovery.edit.php:464 -#: include/views/configuration.item.edit.php:611 -#: include/views/configuration.item.massupdate.php:296 -#: include/views/configuration.item.prototype.edit.php:543 +#: include/views/configuration.host.discovery.edit.php:447 +#: include/views/configuration.item.edit.php:598 +#: include/views/configuration.item.massupdate.php:282 +#: include/views/configuration.item.prototype.edit.php:524 #: include/views/configuration.item.prototype.massupdate.php:277 msgid "Authentication method" msgstr "Метод аутентификации" -#: app/controllers/CControllerAuthenticationUpdate.php:232 +#: app/controllers/CControllerAuthenticationUpdate.php:238 msgid "Authentication method changed" msgstr "Метод аутентификации изменён" -#: include/views/configuration.host.discovery.edit.php:431 -#: include/views/configuration.item.edit.php:554 -#: include/views/configuration.item.massupdate.php:234 -#: include/views/configuration.item.prototype.edit.php:510 +#: include/views/configuration.host.discovery.edit.php:419 +#: include/views/configuration.item.edit.php:540 +#: include/views/configuration.item.massupdate.php:226 +#: include/views/configuration.item.prototype.edit.php:496 #: include/views/configuration.item.prototype.massupdate.php:222 #: include/views/js/configuration.discovery.edit.js.php:103 msgid "Authentication passphrase" msgstr "Пароль аутентификации" -#: include/views/configuration.host.discovery.edit.php:424 -#: include/views/configuration.item.edit.php:548 -#: include/views/configuration.item.massupdate.php:221 -#: include/views/configuration.item.prototype.edit.php:503 +#: include/views/configuration.host.discovery.edit.php:412 +#: include/views/configuration.item.edit.php:535 +#: include/views/configuration.item.massupdate.php:214 +#: include/views/configuration.item.prototype.edit.php:489 #: include/views/configuration.item.prototype.massupdate.php:210 #: include/views/js/configuration.discovery.edit.js.php:95 msgid "Authentication protocol" msgstr "Протокол аутентификации" -#: app/controllers/CControllerAuthenticationUpdate.php:231 +#: app/controllers/CControllerAuthenticationUpdate.php:237 msgid "Authentication settings updated" msgstr "Настройки аутентификации обновлены" @@ -1388,7 +1389,7 @@ msgstr "Цвет фона" msgid "Background image" msgstr "Фоновое изображение" -#: app/views/administration.authentication.edit.php:93 +#: app/views/administration.authentication.edit.php:98 msgid "Base DN" msgstr "База для поиска (Base DN)" @@ -1398,17 +1399,17 @@ msgid "Base colour" msgstr "Основной цвет" #: include/httptest.inc.php:28 -#: include/views/configuration.host.discovery.edit.php:285 -#: include/views/configuration.item.edit.php:326 -#: include/views/configuration.item.prototype.edit.php:314 +#: include/views/configuration.host.discovery.edit.php:276 +#: include/views/configuration.item.edit.php:319 +#: include/views/configuration.item.prototype.edit.php:304 msgid "Basic" msgstr "Простая" -#: app/views/administration.authentication.edit.php:103 +#: app/views/administration.authentication.edit.php:110 msgid "Bind DN" msgstr "Имя для подключения (Bind DN)" -#: app/views/administration.authentication.edit.php:113 +#: app/views/administration.authentication.edit.php:121 msgid "Bind password" msgstr "Пароль подключения (Bind password)" @@ -1426,16 +1427,16 @@ msgid "Blue" msgstr "Голубая" #: app/views/popup.httpstep.php:142 -#: include/views/configuration.host.discovery.edit.php:261 -#: include/views/configuration.item.edit.php:293 -#: include/views/configuration.item.prototype.edit.php:281 +#: include/views/configuration.host.discovery.edit.php:254 +#: include/views/configuration.item.edit.php:289 +#: include/views/configuration.item.prototype.edit.php:274 msgid "Body" msgstr "Тело" #: app/views/popup.httpstep.php:144 -#: include/views/configuration.host.discovery.edit.php:263 -#: include/views/configuration.item.edit.php:295 -#: include/views/configuration.item.prototype.edit.php:283 +#: include/views/configuration.host.discovery.edit.php:256 +#: include/views/configuration.item.edit.php:291 +#: include/views/configuration.item.prototype.edit.php:276 msgid "Body and headers" msgstr "Тело и заголовки" @@ -1444,7 +1445,7 @@ msgstr "Тело и заголовки" msgid "Bold line" msgstr "Жирная линия" -#: include/items.inc.php:1757 +#: include/items.inc.php:1749 msgid "Boolean to decimal" msgstr "Логический в десятичный" @@ -1622,13 +1623,13 @@ msgstr "Не удалось добавить условие корреляции msgid "Cannot add dependency from a host to a template." msgstr "Не удалось добавить зависимость от узла сети к шаблону." -#: include/classes/api/services/CDiscoveryRule.php:847 +#: include/classes/api/services/CDiscoveryRule.php:864 #: include/triggers.inc.php:527 #, c-format msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"." msgstr "Не удалось добавить зависимость от триггера \"%1$s:%2$s\" к несуществующему триггеру \"%3$s:%4$s\"." -#: host_discovery.php:474 +#: host_discovery.php:553 msgid "Cannot add discovery rule" msgstr "Не удалось добавить правило обнаружения" @@ -1684,7 +1685,7 @@ msgstr "Не удалось добавить обслуживание" #: include/classes/api/services/CMap.php:1487 #, c-format msgid "Cannot add map element of the map \"%1$s\" due to circular reference." -msgstr "" +msgstr "Не удалось добавить элемент карты на карту \"%1$s\" по причине цикличности." #: app/controllers/CControllerMediatypeCreate.php:70 #: app/controllers/CControllerMediatypeCreate.php:160 @@ -1774,36 +1775,36 @@ msgstr "Не удалось добавить виджеты в режиме ки #: include/classes/validators/CLdapAuthValidator.php:72 msgid "Cannot bind anonymously to LDAP server." -msgstr "" +msgstr "Не удалось привязать анонимно к LDAP серверу." #: include/classes/validators/CLdapAuthValidator.php:71 msgid "Cannot bind to LDAP server." -msgstr "" +msgstr "Не удалось привязать к LDAP серверу." #: include/classes/api/clients/CLocalApiClient.php:87 #, c-format msgid "Cannot call method \"%1$s.%2$s\" without parameters." msgstr "Не удалось вызвать метод \"%1$s.%2$s\" без параметров." -#: httpconf.php:198 httpconf.php:504 items.php:999 items.php:1394 +#: httpconf.php:198 httpconf.php:504 items.php:999 items.php:1395 msgid "Cannot clear history" msgstr "Не удалось очистить историю" -#: include/classes/api/services/CDiscoveryRule.php:1588 +#: include/classes/api/services/CDiscoveryRule.php:1894 msgid "Cannot clone graph prototypes." msgstr "Не удалось клонировать прототипы графиков." -#: include/classes/api/services/CDiscoveryRule.php:1636 +#: include/classes/api/services/CDiscoveryRule.php:1942 msgid "Cannot clone host prototypes." msgstr "Не удалось клонировать прототипы узлов сети." -#: include/classes/api/services/CDiscoveryRule.php:1393 -#: include/classes/api/services/CDiscoveryRule.php:1449 -#: include/classes/api/services/CDiscoveryRule.php:1467 +#: include/classes/api/services/CDiscoveryRule.php:1699 +#: include/classes/api/services/CDiscoveryRule.php:1755 +#: include/classes/api/services/CDiscoveryRule.php:1773 msgid "Cannot clone item prototypes." msgstr "Не удалось клонировать прототипы элементов данных." -#: include/classes/api/services/CDiscoveryRule.php:760 +#: include/classes/api/services/CDiscoveryRule.php:777 msgid "Cannot clone trigger prototypes." msgstr "Не удалось клонировать прототипы триггеров." @@ -1814,7 +1815,7 @@ msgstr "Не удалось закрыть проблему: %1$s." #: include/classes/validators/CLdapAuthValidator.php:70 msgid "Cannot connect to LDAP server." -msgstr "" +msgstr "Не удалось подключиться к LDAP серверу." #: include/classes/setup/CSetupWizard.php:255 msgid "Cannot connect to the database." @@ -1831,7 +1832,7 @@ msgstr[0] "Не удалось скопировать график" msgstr[1] "Не удалось скопировать графики" msgstr[2] "Не удалось скопировать графики" -#: items.php:1350 +#: items.php:1351 msgid "Cannot copy item" msgid_plural "Cannot copy items" msgstr[0] "Не удалось скопировать элемент даных" @@ -1938,11 +1939,11 @@ msgstr "Не удалось удалить зависимость" msgid "Cannot delete discovered application \"%1$s\"." msgstr "Не удалось удалить обнаруженную группу элементов данных \"%1$s\"." -#: discoveryconf.php:186 host_discovery.php:274 +#: discoveryconf.php:186 host_discovery.php:278 msgid "Cannot delete discovery rule" msgstr "Не удалось удалить правило обнаружения" -#: discoveryconf.php:228 host_discovery.php:517 +#: discoveryconf.php:228 host_discovery.php:596 msgid "Cannot delete discovery rules" msgstr "Не удалось удалить правила обнаружения" @@ -1973,7 +1974,23 @@ msgstr[2] "Не удалось удалить группы" msgid "Cannot delete host" msgstr "Не удалось удалить узел сети" -#: include/classes/api/services/CDiscoveryRule.php:533 +#: include/classes/api/services/CHost.php:1189 +#, 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\" должно содержать по крайней мере один узел сети или группу узлов сети." + +#: include/classes/api/services/CHostGroup.php:1503 +#, 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\" должно содержать по крайней мере один узел сети или группу узлов сети." + +#: include/classes/api/services/CDiscoveryRule.php:548 msgid "Cannot delete host prototype." msgstr "Не удалось удалить прототип узлов сети." @@ -2005,7 +2022,7 @@ msgstr "Не удалось удалить прототип элементов msgid "Cannot delete item prototypes" msgstr "Не удалось удалить прототипы элементов данных" -#: items.php:1404 +#: items.php:1405 msgid "Cannot delete items" msgstr "Не удалось удалить элементы данных" @@ -2080,25 +2097,25 @@ msgstr "Не удалось удалить группу элементов да #: include/classes/api/services/CGraphPrototype.php:575 msgid "Cannot delete templated graph prototype." -msgstr "" +msgstr "Не удалось удалить прототип графиков унаследованный из шаблона." #: include/classes/api/services/CGraph.php:559 msgid "Cannot delete templated graph." -msgstr "" +msgstr "Не удалось удалить график унаследованный из шаблона." #: include/classes/api/services/CHostPrototype.php:1071 msgid "Cannot delete templated host prototype." msgstr "Невозможно удалить прототип узлов сети унаследованный из шаблона." -#: include/classes/api/services/CItemPrototype.php:876 +#: include/classes/api/services/CItemPrototype.php:890 msgid "Cannot delete templated item prototype." -msgstr "" +msgstr "Не удалось удалить прототип элементов данных унаследованный из шаблона." -#: include/classes/api/services/CItem.php:706 +#: include/classes/api/services/CItem.php:719 msgid "Cannot delete templated item." msgstr "Невозможно удалить элемент данных унаследованный из шаблона." -#: include/classes/api/services/CDiscoveryRule.php:484 +#: include/classes/api/services/CDiscoveryRule.php:499 msgid "Cannot delete templated items." msgstr "Невозможно удалить элементы данных унаследованные из шаблонов." @@ -2110,7 +2127,7 @@ msgstr "Невозможно удалить триггер \"%1$s:%2$s\" уна #: include/classes/api/services/CTriggerPrototype.php:541 #, c-format msgid "Cannot delete templated trigger prototype \"%1$s:%2$s\"." -msgstr "" +msgstr "Не удалось удалить прототип графиков \"%1$s:%2$s\" унаследованный из шаблона." #: include/classes/api/services/CHttpTest.php:555 #, c-format @@ -2162,7 +2179,7 @@ msgstr[0] "Не удалось деактивировать корреляцию msgstr[1] "Не удалось деактивировать корреляции" msgstr[2] "Не удалось деактивировать корреляции" -#: discoveryconf.php:213 host_discovery.php:507 +#: discoveryconf.php:213 host_discovery.php:586 msgid "Cannot disable discovery rule" msgid_plural "Cannot disable discovery rules" msgstr[0] "Не удалось деактивировать правило обнаружения" @@ -2177,7 +2194,7 @@ msgstr[0] "Не удалось деактивировать узел сети" msgstr[1] "Не удалось деактивировать узлы сети" msgstr[2] "Не удалось деактивировать узлы сети" -#: applications.php:175 items.php:1310 +#: applications.php:175 items.php:1311 msgid "Cannot disable item" msgid_plural "Cannot disable items" msgstr[0] "Не удалось деактивировать элемент данных" @@ -2234,7 +2251,7 @@ msgstr[0] "Не удалось активировать корреляцию" msgstr[1] "Не удалось активировать корреляции" msgstr[2] "Не удалось активировать корреляции" -#: discoveryconf.php:212 host_discovery.php:506 +#: discoveryconf.php:212 host_discovery.php:585 msgid "Cannot enable discovery rule" msgid_plural "Cannot enable discovery rules" msgstr[0] "Не удалось активировать правило обнаружения" @@ -2249,7 +2266,7 @@ msgstr[0] "Не удалось активировать узел сети" msgstr[1] "Не удалось активировать узлы сети" msgstr[2] "Не удалось активировать узлы сети" -#: applications.php:174 items.php:1309 +#: applications.php:174 items.php:1310 msgid "Cannot enable item" msgid_plural "Cannot enable items" msgstr[0] "Не удалось активировать элемент данных" @@ -2322,13 +2339,13 @@ msgstr "Не удалось найти узел сети \"%1$s\" использ msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"." msgstr "Не удалось найти узел сети \"%1$s\" используемый в комплексном экране \"%2$s\"." -#: include/classes/import/CConfigurationImport.php:1086 +#: include/classes/import/CConfigurationImport.php:1094 #, 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:1256 -#: include/classes/api/services/CDiscoveryRule.php:1420 +#: include/classes/api/services/CDiscoveryRule.php:1562 +#: include/classes/api/services/CDiscoveryRule.php:1726 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:506 #: include/items.inc.php:653 #, c-format @@ -2345,32 +2362,32 @@ msgstr "Не удалось найти иконку \"%1$s\" используе msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"." msgstr "Не удалось найти иконку \"%1$s\" используемую на карте сети \"%2$s\"." -#: include/classes/import/CConfigurationImport.php:1470 +#: include/classes/import/CConfigurationImport.php:1478 #, 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:1239 +#: include/classes/import/CConfigurationImport.php:1247 #, 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:1454 +#: include/classes/import/CConfigurationImport.php:1462 #, 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:1219 +#: include/classes/import/CConfigurationImport.php:1227 #, 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:1489 +#: include/classes/import/CConfigurationImport.php:1497 #, 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:1259 +#: include/classes/import/CConfigurationImport.php:1267 #, 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\"." @@ -2399,7 +2416,7 @@ msgstr "Не удалось найти объекты с именем" msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"." msgstr "Не удалось найти комплексный экран \"%1$s\" используемый в комплексном экране \"%2$s\"." -#: include/classes/import/CConfigurationImport.php:1109 +#: include/classes/import/CConfigurationImport.php:1117 #, 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\"." @@ -2415,7 +2432,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:1014 +#: include/classes/import/CConfigurationImport.php:1022 #, 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\"." @@ -2428,7 +2445,7 @@ msgstr "Не удалось построить дерево. Проверьте msgid "Cannot format tree." msgstr "Не удалось построить дерево." -#: include/classes/api/services/CTemplate.php:805 +#: include/classes/api/services/CTemplate.php:803 msgid "Cannot have empty visible template name." msgstr "Видимое имя шаблона не может быть пустым." @@ -2466,8 +2483,8 @@ msgstr "Не удалось вставить выражение триггера msgid "Cannot link template" msgstr "Не удалось присоединить шаблон" -#: include/classes/api/services/CTemplate.php:892 -#: include/classes/api/services/CTemplate.php:906 +#: include/classes/api/services/CTemplate.php:890 +#: include/classes/api/services/CTemplate.php:904 msgid "Cannot link template." msgstr "Не удалось присоединить шаблон." @@ -2479,7 +2496,7 @@ msgstr "Не удалось выполнить выход." msgid "Cannot mass update host name." msgstr "Невозможно массово обновить имя узла сети." -#: include/classes/api/services/CTemplate.php:1030 +#: include/classes/api/services/CTemplate.php:1028 msgid "Cannot mass update template name." msgstr "Невозможно массово обновить имя шаблона." @@ -2487,7 +2504,7 @@ msgstr "Невозможно массово обновить имя шаблон msgid "Cannot mass update visible host name." msgstr "Невозможно массово обновить видимое имя узла сети." -#: include/classes/api/services/CTemplate.php:995 +#: include/classes/api/services/CTemplate.php:993 msgid "Cannot mass update visible template name." msgstr "Невозможно массово обновить видимое имя шаблона." @@ -2515,8 +2532,8 @@ msgstr "Невозможно выполнить запрос обновлени msgid "Cannot process applications from different hosts or templates." msgstr "Не удалось обработать группы элементов данных из разных узлов сети или шаблонов." -#: include/classes/api/services/CItemGeneral.php:2235 -#: include/classes/api/services/CItemGeneral.php:2262 +#: include/classes/api/services/CItemGeneral.php:2198 +#: include/classes/api/services/CItemGeneral.php:2225 msgid "Cannot read JSON." msgstr "Не удалось прочитать JSON." @@ -2525,8 +2542,8 @@ msgstr "Не удалось прочитать JSON." msgid "Cannot read JSON: %1$s." msgstr "Не удалось прочитать JSON: %1$s." -#: include/classes/api/services/CItemGeneral.php:2222 -#: include/classes/api/services/CItemGeneral.php:2226 +#: include/classes/api/services/CItemGeneral.php:2185 +#: include/classes/api/services/CItemGeneral.php:2189 #: include/classes/import/readers/CXmlImportReader.php:35 #: include/classes/import/readers/CXmlImportReader.php:46 #, c-format @@ -2557,7 +2574,7 @@ msgstr "Не удалось сохранить виджет \"%1$s\"." msgid "Cannot send command, check connection with Zabbix server \"%1$s\"." msgstr "Не удалось отправить команду, проверьте соединение с Zabbix сервером \"%1$s\"." -#: host_discovery.php:284 host_discovery.php:529 items.php:967 items.php:1416 +#: host_discovery.php:288 host_discovery.php:608 items.php:967 items.php:1417 msgid "Cannot send request" msgstr "Не удалось отправить запрос" @@ -2606,7 +2623,7 @@ msgstr "Не удалось установить \"%1$s\" для триггер msgid "Cannot set \"%1$s\" for trigger prototype \"%2$s\"." msgstr "Не удалось установить \"%1$s\" для прототипа триггера \"%2$s\"." -#: include/classes/api/services/CItemPrototype.php:324 +#: include/classes/api/services/CItemPrototype.php:339 #, c-format msgid "Cannot set \"templateid\" field for application prototype in item prototype \"%1$s\"." msgstr "Не удалось установить поле \"templateid\" для прототипа группы элементов данных в прототипе элементов данных \"%1$s\"." @@ -2617,8 +2634,8 @@ msgid "Cannot set \"templateid\" for screen \"%1$s\"." msgstr "Не удалось установить \"templateid\" для комплексного экрана \"%1$s\"." #: include/classes/api/services/CHost.php:881 -#: include/classes/api/services/CHost.php:1705 -#: include/classes/api/services/CHost.php:1849 +#: include/classes/api/services/CHost.php:1741 +#: include/classes/api/services/CHost.php:1885 msgid "Cannot set inventory fields for disabled inventory." msgstr "Невозможно задать поля инвентарных данных при отключенной инвентаризации." @@ -2635,15 +2652,15 @@ msgstr "Не удалось переключить узел сети на инт msgid "Cannot unblock users" msgstr "Не удалось разблокировать пользователей" -#: include/classes/api/services/CHostGeneral.php:563 +#: include/classes/api/services/CHostGeneral.php:559 msgid "Cannot unlink and clear Web scenarios." msgstr "Не удалось отсоединить и очистить Веб-сценарии." -#: include/classes/api/services/CHostGeneral.php:624 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear applications." msgstr "Не удалось отсоединить и очистить группы элементов данных." -#: include/classes/api/services/CHostGeneral.php:367 +#: include/classes/api/services/CHostGeneral.php:363 msgid "Cannot unlink and clear discovery rules" msgstr "Не удалось отсоединить и очистить правила обнаружения" @@ -2651,12 +2668,12 @@ msgstr "Не удалось отсоединить и очистить прав msgid "Cannot unlink template" msgstr "Не удалось отсоединить шаблон" -#: include/classes/api/services/CTemplate.php:857 -#: include/classes/api/services/CTemplate.php:880 +#: include/classes/api/services/CTemplate.php:855 +#: include/classes/api/services/CTemplate.php:878 msgid "Cannot unlink template." msgstr "Не удалось отсоединить шаблон." -#: include/classes/api/services/CHostGeneral.php:273 +#: include/classes/api/services/CHostGeneral.php:269 #, c-format msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host." msgstr "Не удалось отсоединить триггер \"%s\", он содержит элементы данных из шаблона, которые остаются присоединенными к узлу сети." @@ -2702,7 +2719,7 @@ msgstr "Не удалось обновить \"%1$s\" для триггера \" msgid "Cannot update \"%1$s\" for trigger prototype \"%2$s\"." msgstr "Не удалось обновить \"%1$s\" для прототипа триггера \"%2$s\"." -#: include/classes/api/services/CHost.php:1828 +#: include/classes/api/services/CHost.php:1864 #, c-format msgid "Cannot update \"%2$s\" for a discovered host \"%1$s\"." msgstr "Не удалось обновить \"%1$s\" у обнаруженного узла сети \"%2$s\"." @@ -2738,7 +2755,7 @@ msgstr "Не удалось обновить \"templateid\" для шаблон msgid "Cannot update a discovered graph." msgstr "Невозможно обновить обнаруженный график." -#: include/classes/api/services/CHostGroup.php:780 +#: include/classes/api/services/CHostGroup.php:797 msgid "Cannot update a discovered host group." msgstr "Невозможно обновить обнаруженную группу узлов сети." @@ -2755,7 +2772,7 @@ msgstr "Не удалось обновить действие" msgid "Cannot update application" msgstr "Не удалось обновить группу элементов данных" -#: app/controllers/CControllerAuthenticationUpdate.php:236 +#: app/controllers/CControllerAuthenticationUpdate.php:242 msgid "Cannot update authentication" msgstr "Не удалось обновить аутентификацию" @@ -2782,7 +2799,7 @@ msgstr "Не удалось обновить описание" msgid "Cannot update discovered application \"%1$s\"." msgstr "Не удалось обновить обнаруженную группу элементов данных \"%1$s\"." -#: discoveryconf.php:155 host_discovery.php:477 +#: discoveryconf.php:155 host_discovery.php:556 msgid "Cannot update discovery rule" msgstr "Не удалось обновить правило обнаружения" @@ -2810,9 +2827,9 @@ msgstr "Не удалось обновить прототип графиков" msgid "Cannot update group" msgstr "Не удалось обновить группу" -#: include/classes/api/services/CHostGroup.php:986 -#: include/classes/api/services/CHostGroup.php:1090 -#: include/classes/api/services/CHostGroup.php:1226 +#: include/classes/api/services/CHostGroup.php:1003 +#: include/classes/api/services/CHostGroup.php:1107 +#: include/classes/api/services/CHostGroup.php:1243 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "Не удалось обновить группы для обнаруженного узла сети \"%1$s\"." @@ -2860,11 +2877,11 @@ msgstr[0] "Не удалось обновить прототип элемент msgstr[1] "Не удалось обновить прототипы элементов данных" msgstr[2] "Не удалось обновить прототипы элементов данных" -#: disc_prototypes.php:1103 +#: disc_prototypes.php:1116 msgid "Cannot update item prototypes" -msgstr "" +msgstr "Не удалось обновить прототипы элементов данных" -#: items.php:1286 +#: items.php:1287 msgid "Cannot update items" msgstr "Не удалось обновить элементы данных" @@ -2932,7 +2949,7 @@ msgid "Cannot update templated applications." msgstr "Не удалось обновить шаблонные группы элементов данных." #: include/classes/api/services/CTemplate.php:754 -#: include/classes/api/services/CTemplate.php:1090 +#: include/classes/api/services/CTemplate.php:1088 #, c-format msgid "Cannot update templates on discovered host \"%1$s\"." msgstr "Не удалось обновить шаблоны для обнаруженного узла сети \"%1$s\"." @@ -2987,8 +3004,8 @@ msgstr "Не удалось проверить проверку обнаруже msgid "Case sensitive" msgstr "Регистрозависимое" -#: app/views/administration.authentication.edit.php:52 -#: app/views/administration.authentication.edit.php:108 +#: app/views/administration.authentication.edit.php:53 +#: app/views/administration.authentication.edit.php:115 msgid "Case sensitive login" msgstr "Регистрозависимое имя входа" @@ -3007,7 +3024,7 @@ msgstr "Отлов всех SNMP трапов, которые не были по #: include/views/js/monitoring.sysmaps.js.php:11 #: include/views/monitoring.screen.constructor.edit.php:872 msgid "Centre" -msgstr "" +msgstr "По центру" #: app/views/administration.proxy.edit.php:91 #: app/views/administration.proxy.edit.php:99 @@ -3020,7 +3037,8 @@ msgstr "" msgid "Certificate" msgstr "Сертификат" -#: include/items.inc.php:1748 latest.php:429 latest.php:442 +#: include/items.inc.php:1740 include/items.inc.php:1744 latest.php:429 +#: latest.php:442 msgctxt "noun" msgid "Change" msgstr "Изменение" @@ -3034,13 +3052,13 @@ msgctxt "verb" msgid "Change" msgstr "Изменить" -#: app/views/administration.authentication.edit.php:70 +#: app/views/administration.authentication.edit.php:72 #: app/views/administration.mediatype.edit.php:140 #: include/views/administration.users.edit.php:128 msgid "Change password" msgstr "Изменить пароль" -#: include/items.inc.php:1751 +#: include/items.inc.php:1745 msgid "Change per second" msgstr "Изменение в секунду" @@ -3049,9 +3067,9 @@ msgid "Change severity" msgstr "Изменение важности" #: include/forms.inc.php:353 include/items.inc.php:131 -#: include/views/configuration.item.edit.php:678 -#: include/views/configuration.item.massupdate.php:279 -#: include/views/configuration.item.prototype.edit.php:607 +#: include/views/configuration.item.edit.php:665 +#: include/views/configuration.item.massupdate.php:267 +#: include/views/configuration.item.prototype.edit.php:594 #: include/views/configuration.item.prototype.massupdate.php:262 msgid "Character" msgstr "Символ" @@ -3082,21 +3100,21 @@ msgstr "Проверка уже существует." msgid "Check expression part starting from \"%1$s\"." msgstr "Проверьте часть выражения начиная с \"%1$s\"." -#: include/items.inc.php:1768 +#: include/items.inc.php:1773 msgid "Check for error in JSON" -msgstr "" +msgstr "Проверьте на ошибку в JSON" -#: include/items.inc.php:1769 +#: include/items.inc.php:1777 msgid "Check for error in XML" -msgstr "" +msgstr "Проверьте на ошибку в XML" -#: include/items.inc.php:1770 +#: include/items.inc.php:1781 msgid "Check for error using regular expression" -msgstr "" +msgstr "Проверьте на ошибку при использовании регулярного выражения" -#: include/views/configuration.host.discovery.edit.php:698 +#: include/views/configuration.host.discovery.edit.php:760 #: include/views/configuration.host.discovery.list.php:157 -#: include/views/configuration.item.edit.php:1172 +#: include/views/configuration.item.edit.php:934 #: include/views/configuration.item.list.php:286 msgid "Check now" msgstr "Проверить сейчас" @@ -3211,7 +3229,7 @@ msgid "Clear history" msgstr "Очистить историю" #: include/views/configuration.httpconf.edit.php:297 -#: include/views/configuration.item.edit.php:1182 +#: include/views/configuration.item.edit.php:944 msgid "Clear history and trends" msgstr "Очистить историю и динамику изменений" @@ -3235,13 +3253,13 @@ msgstr "Часы" #: include/views/configuration.correlation.edit.php:277 #: include/views/configuration.discovery.edit.php:110 #: include/views/configuration.graph.edit.php:465 -#: include/views/configuration.host.discovery.edit.php:695 +#: include/views/configuration.host.discovery.edit.php:757 #: include/views/configuration.host.edit.php:812 #: include/views/configuration.hostgroups.edit.php:58 #: include/views/configuration.host.prototype.edit.php:436 #: include/views/configuration.httpconf.edit.php:290 -#: include/views/configuration.item.edit.php:1169 -#: include/views/configuration.item.prototype.edit.php:1004 +#: include/views/configuration.item.edit.php:931 +#: include/views/configuration.item.prototype.edit.php:769 #: include/views/configuration.maintenance.edit.php:287 #: include/views/configuration.template.edit.php:445 #: include/views/configuration.trigger.prototype.edit.php:636 @@ -3375,7 +3393,7 @@ msgstr "Условие \"%2$s\" не используется в формуле msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" для корреляции \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1081 +#: include/classes/api/services/CDiscoveryRule.php:1245 #, 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\"." @@ -3390,7 +3408,7 @@ msgstr "Условие \"%2$s\" используемое в формуле \"%3$ msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" для корреляции \"%1$s\" не определено." -#: include/classes/api/services/CDiscoveryRule.php:1080 +#: include/classes/api/services/CDiscoveryRule.php:1244 #, 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\" не определено." @@ -3442,7 +3460,7 @@ msgstr "Настройка действий" msgid "Configuration of applications" msgstr "Настройка групп элементов данных" -#: app/controllers/CControllerAuthenticationEdit.php:127 +#: app/controllers/CControllerAuthenticationEdit.php:120 msgid "Configuration of authentication" msgstr "Настройка аутентификации" @@ -3761,10 +3779,10 @@ msgstr "Управление содержимым" msgid "Content menu" msgstr "Меню содержимого" -#: include/views/configuration.host.discovery.edit.php:400 -#: include/views/configuration.item.edit.php:495 -#: include/views/configuration.item.massupdate.php:193 -#: include/views/configuration.item.prototype.edit.php:479 +#: include/views/configuration.host.discovery.edit.php:385 +#: include/views/configuration.item.edit.php:481 +#: include/views/configuration.item.massupdate.php:189 +#: include/views/configuration.item.prototype.edit.php:464 #: include/views/configuration.item.prototype.massupdate.php:185 #: include/views/js/configuration.discovery.edit.js.php:72 msgid "Context name" @@ -3774,8 +3792,8 @@ msgstr "Имя контекста" msgid "Contract number" msgstr "Номер контракта" -#: include/views/configuration.item.edit.php:303 -#: include/views/configuration.item.prototype.edit.php:291 +#: include/views/configuration.item.edit.php:298 +#: include/views/configuration.item.prototype.edit.php:283 msgid "Convert to JSON" msgstr "Конвертация в JSON" @@ -3918,10 +3936,10 @@ msgstr "Создать правило обнаружения" #: include/views/configuration.host.prototype.edit.php:164 #: include/views/configuration.host.prototype.list.php:55 #: include/views/configuration.host.prototype.list.php:154 -#: include/views/configuration.item.prototype.edit.php:761 +#: include/views/configuration.item.prototype.edit.php:747 #: include/views/configuration.item.prototype.list.php:59 #: include/views/configuration.item.prototype.list.php:170 -#: include/views/configuration.item.prototype.massupdate.php:518 +#: include/views/configuration.item.prototype.massupdate.php:418 #: include/views/configuration.trigger.prototype.edit.php:539 #: include/views/configuration.trigger.prototype.list.php:53 #: include/views/configuration.trigger.prototype.list.php:158 @@ -4087,7 +4105,7 @@ msgstr "Пользовательское" #: include/views/configuration.action.edit.php:114 #: include/views/configuration.correlation.edit.php:96 -#: include/views/configuration.host.discovery.edit.php:600 +#: include/views/configuration.host.discovery.edit.php:588 msgid "Custom expression" msgstr "Пользовательское выражение" @@ -4095,11 +4113,11 @@ msgstr "Пользовательское выражение" msgid "Custom graphs" msgstr "Пользовательские графики" -#: include/views/configuration.host.discovery.edit.php:559 -#: include/views/configuration.item.edit.php:754 -#: include/views/configuration.item.massupdate.php:502 -#: include/views/configuration.item.prototype.edit.php:669 -#: include/views/configuration.item.prototype.massupdate.php:480 +#: include/views/configuration.host.discovery.edit.php:548 +#: include/views/configuration.item.edit.php:741 +#: include/views/configuration.item.massupdate.php:384 +#: include/views/configuration.item.prototype.edit.php:656 +#: include/views/configuration.item.prototype.massupdate.php:380 msgid "Custom intervals" msgstr "Пользовательские интервалы" @@ -4113,15 +4131,12 @@ msgstr "Пользовательская подпись" msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty." msgstr "Пользовательская подпись для карты сети \"%2$s\" у элементов с типом \"%1$s\" не может быть пустой." -#: include/items.inc.php:1744 +#: include/items.inc.php:1737 msgid "Custom multiplier" msgstr "Пользовательский множитель" -#: include/views/configuration.item.edit.php:938 -#: include/views/configuration.item.edit.php:1099 -#: include/views/configuration.item.prototype.edit.php:771 -#: include/views/configuration.item.prototype.edit.php:932 -#: include/views/js/common.item.edit.js.php:75 +#: include/forms.inc.php:1399 include/forms.inc.php:1563 +#: include/views/js/item.preprocessing.js.php:44 msgid "Custom on fail" msgstr "" @@ -4156,11 +4171,11 @@ msgctxt "XML date format" msgid "DD.MM.YY" msgstr "DD.MM.YY" -#: include/views/configuration.host.discovery.edit.php:438 -#: include/views/configuration.item.edit.php:564 -#: include/views/configuration.item.edit.php:571 -#: include/views/configuration.item.massupdate.php:247 -#: include/views/configuration.item.prototype.edit.php:517 +#: include/views/configuration.host.discovery.edit.php:426 +#: include/views/configuration.item.edit.php:550 +#: include/views/configuration.item.edit.php:557 +#: include/views/configuration.item.massupdate.php:238 +#: include/views/configuration.item.prototype.edit.php:503 #: include/views/configuration.item.prototype.massupdate.php:234 #: include/views/js/configuration.discovery.edit.js.php:112 msgid "DES" @@ -4186,7 +4201,7 @@ msgstr "DNS" msgid "DNS name" msgstr "DNS имя" -#: app/views/report.services.php:34 include/forms.inc.php:1875 +#: app/views/report.services.php:34 include/forms.inc.php:2123 #: include/maintenances.inc.php:33 report4.php:107 msgid "Daily" msgstr "Ежедневно" @@ -4325,7 +4340,7 @@ msgstr "Тип базы данных" msgid "Database user" msgstr "Имя пользователя от базы данных" -#: include/forms.inc.php:2004 include/forms.inc.php:2089 maintenance.php:51 +#: include/forms.inc.php:2252 include/forms.inc.php:2337 maintenance.php:51 msgid "Date" msgstr "Дата" @@ -4353,16 +4368,16 @@ msgstr "День" msgid "Day before yesterday" msgstr "За день до вчера" -#: include/forms.inc.php:2006 include/forms.inc.php:2067 +#: include/forms.inc.php:2254 include/forms.inc.php:2315 msgid "Day of month" msgstr "День месяца" -#: include/forms.inc.php:1908 include/forms.inc.php:2007 -#: include/forms.inc.php:2015 +#: include/forms.inc.php:2156 include/forms.inc.php:2255 +#: include/forms.inc.php:2263 msgid "Day of week" msgstr "День недели" -#: include/forms.inc.php:2116 +#: include/forms.inc.php:2364 msgid "Days" msgstr "Дни" @@ -4384,7 +4399,7 @@ msgstr "Режим отладки обновлен" msgid "Dec" msgstr "Дек." -#: include/forms.inc.php:1999 include/func.inc.php:127 +#: include/forms.inc.php:2247 include/func.inc.php:127 #: include/func.inc.php:264 jsLoader.php:144 msgid "December" msgstr "Декабрь" @@ -4414,7 +4429,7 @@ msgstr "Задержка по умолчанию" msgid "Default host inventory mode" msgstr "Режим инвентаризации узлов сети по умолчанию" -#: app/views/administration.authentication.edit.php:41 +#: app/views/administration.authentication.edit.php:42 msgid "Default login form" msgstr "Диалог входа в систему по умолчанию" @@ -4451,8 +4466,8 @@ msgstr "Тема по умолчанию" msgid "Default theme \"%1$s\"." msgstr "Тема по умолчанию \"%1$s\"." -#: include/views/configuration.item.massupdate.php:448 -#: include/views/configuration.item.prototype.massupdate.php:426 +#: include/views/configuration.item.massupdate.php:330 +#: include/views/configuration.item.prototype.massupdate.php:326 #: include/views/monitoring.slideconf.edit.php:114 #: include/views/monitoring.slideconf.list.php:64 msgid "Delay" @@ -4535,7 +4550,7 @@ msgid "Delete dashboard?" msgstr "Удалить панель?" #: include/views/configuration.discovery.edit.php:111 -#: include/views/configuration.host.discovery.edit.php:705 +#: include/views/configuration.host.discovery.edit.php:767 msgid "Delete discovery rule?" msgstr "Удалить правило обнаружения?" @@ -4566,11 +4581,11 @@ msgstr "Очистить историю выбранных веб-сценари msgid "Delete icon map?" msgstr "Удалить соответствие иконок?" -#: include/views/configuration.item.prototype.edit.php:1005 +#: include/views/configuration.item.prototype.edit.php:770 msgid "Delete item prototype?" msgstr "Удалить прототип элементов данных?" -#: include/views/configuration.item.edit.php:1187 +#: include/views/configuration.item.edit.php:949 msgid "Delete item?" msgstr "Удалить элемент данных?" @@ -4789,7 +4804,7 @@ msgstr "Удалить веб-сценарий?" msgid "Deleted" msgstr "Удален" -#: include/classes/api/services/CHost.php:1305 +#: include/classes/api/services/CHost.php:1341 #, c-format msgid "Deleted: Host \"%1$s\"." msgstr "Удалено: Узел сети \"%1$s\"." @@ -4848,13 +4863,13 @@ msgstr "Состояние развертывания" #: include/classes/screens/CScreenEvents.php:32 #: include/views/administration.auditlogs.list.php:76 #: include/views/configuration.correlation.edit.php:205 -#: include/views/configuration.host.discovery.edit.php:580 +#: include/views/configuration.host.discovery.edit.php:569 #: include/views/configuration.host.edit.php:264 #: include/views/configuration.host.massupdate.php:161 -#: include/views/configuration.item.edit.php:919 -#: include/views/configuration.item.massupdate.php:685 -#: include/views/configuration.item.prototype.edit.php:754 -#: include/views/configuration.item.prototype.massupdate.php:679 +#: include/views/configuration.item.edit.php:905 +#: include/views/configuration.item.massupdate.php:567 +#: include/views/configuration.item.prototype.edit.php:743 +#: include/views/configuration.item.prototype.massupdate.php:579 #: include/views/configuration.maintenance.edit.php:67 #: include/views/configuration.maintenance.list.php:75 #: include/views/configuration.template.edit.php:108 @@ -5025,17 +5040,15 @@ msgstr "Деактивировано" msgid "Disaster" msgstr "Чрезвычайная" -#: include/items.inc.php:1776 +#: include/items.inc.php:1785 msgid "Discard unchanged" msgstr "" -#: include/items.inc.php:1777 +#: include/items.inc.php:1789 msgid "Discard unchanged with heartbeat" msgstr "" -#: include/views/configuration.item.edit.php:1077 -#: include/views/configuration.item.prototype.edit.php:910 -#: include/views/js/common.item.edit.js.php:80 +#: include/forms.inc.php:1541 include/views/js/item.preprocessing.js.php:49 msgid "Discard value" msgstr "" @@ -5100,17 +5113,17 @@ msgstr "Объект обнаружения" #: app/views/monitoring.discovery.view.php:36 #: app/views/monitoring.widget.discovery.view.php:28 #: include/actions.inc.php:52 include/audit.inc.php:46 -#: include/forms.inc.php:1116 +#: include/forms.inc.php:1113 #: include/views/configuration.discovery.edit.php:102 msgid "Discovery rule" msgstr "Правило обнаружения" -#: include/classes/api/services/CDiscoveryRule.php:35 +#: include/classes/api/services/CDiscoveryRule.php:46 #, c-format msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "Правило обнаружения \"%1$s\" уже существует у \"%2$s\", наследуется из другого шаблона." -#: include/classes/api/services/CDiscoveryRule.php:36 +#: include/classes/api/services/CDiscoveryRule.php:47 #, c-format msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"." msgstr "Правило обнаружения \"%1$s\" уже существует у \"%2$s\"." @@ -5129,29 +5142,29 @@ msgstr "Правило обнаружения \"%1$s\" уже существуе msgid "Discovery rule \"%1$s\" is used in \"%2$s\" action." msgstr "Правило обнаружения \"%1$s\" используется в \"%2$s\" действии." -#: discoveryconf.php:161 host_discovery.php:474 +#: discoveryconf.php:161 host_discovery.php:553 msgid "Discovery rule created" msgstr "Правило обнаружения создано" -#: discoveryconf.php:186 host_discovery.php:274 +#: discoveryconf.php:186 host_discovery.php:278 msgid "Discovery rule deleted" msgstr "Правило обнаружения удалено" -#: discoveryconf.php:210 host_discovery.php:504 +#: discoveryconf.php:210 host_discovery.php:583 msgid "Discovery rule disabled" msgid_plural "Discovery rules disabled" msgstr[0] "Правило обнаружения деактивировано" msgstr[1] "Правила обнаружения деактивированы" msgstr[2] "Правила обнаружения деактивированы" -#: discoveryconf.php:209 host_discovery.php:503 +#: discoveryconf.php:209 host_discovery.php:582 msgid "Discovery rule enabled" msgid_plural "Discovery rules enabled" msgstr[0] "Правило обнаружения активировано" msgstr[1] "Правила обнаружения активированы" msgstr[2] "Правила обнаружения активированы" -#: discoveryconf.php:154 host_discovery.php:477 +#: discoveryconf.php:154 host_discovery.php:556 msgid "Discovery rule updated" msgstr "Правило обнаружения обновлено" @@ -5166,7 +5179,7 @@ msgstr "Правило обнаружения обновлено" msgid "Discovery rules" msgstr "Правила обнаружения" -#: discoveryconf.php:228 host_discovery.php:517 +#: discoveryconf.php:228 host_discovery.php:596 msgid "Discovery rules deleted" msgstr "Правила обнаружения удалены" @@ -5231,7 +5244,7 @@ msgstr "Без вычисления" msgid "Do you wish to replace the conditional expression?" msgstr "Вы хотите заменить условие выражения?" -#: include/items.inc.php:1767 +#: include/items.inc.php:1769 msgid "Does not match regular expression" msgstr "" @@ -5306,7 +5319,7 @@ msgstr "Дубликат \"%1$s\" значения \"%2$s\" у корреляц msgid "Duplicate \"description\" value \"%1$s\" for media type." msgstr "Дубликат значения \"описание\"\"%1$s\" у типа оповещений." -#: include/classes/api/services/CItemPrototype.php:334 +#: include/classes/api/services/CItemPrototype.php:349 #, c-format msgid "Duplicate \"name\" value \"%1$s\" for application prototype in item prototype \"%2$s\"." msgstr "Дубликат значения \"имя\" \"%1$s\" у прототипа группы элементов данных в прототипе элементов данных \"%2$s\"." @@ -5333,14 +5346,14 @@ msgstr "Дублирующиеся зависимости в триггере \" msgid "Duplicate dependencies in trigger prototype \"%1$s\"." msgstr "Дубликат зависимостей в прототипе триггеров \"%1$s\"." -#: include/classes/api/services/CHost.php:1641 -#: include/classes/api/services/CHost.php:1879 +#: include/classes/api/services/CHost.php:1677 +#: include/classes/api/services/CHost.php:1915 #, c-format msgid "Duplicate host. Host with the same host name \"%s\" already exists in data." msgstr "Дубликат узла сети. Узел сети с таким же именем \"%s\" уже существует в данных." -#: include/classes/api/services/CHost.php:1648 -#: include/classes/api/services/CHost.php:1899 +#: include/classes/api/services/CHost.php:1684 +#: include/classes/api/services/CHost.php:1935 #, c-format msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data." msgstr "Дубликат узла сети. Узел сети с таким же видимым именем \"%s\" уже существует в данных." @@ -5457,8 +5470,8 @@ msgstr "Эффективное значение" msgid "Elasticsearch error: %1$s." msgstr "Ошибка Elasticsearch: %1$s." -#: include/classes/api/managers/CHistoryManager.php:652 -#: include/classes/api/managers/CHistoryManager.php:661 +#: include/classes/api/managers/CHistoryManager.php:713 +#: include/classes/api/managers/CHistoryManager.php:722 #, c-format msgid "Elasticsearch url is not set for type: %1$s." msgstr "Elasticsearch url не указан для типа: %1$s." @@ -5513,7 +5526,7 @@ msgstr "Пустой файл SSL ключа у веб-сценария \"%1$s\" msgid "Empty action condition." msgstr "Условие действия пустое." -#: include/classes/api/services/CItemPrototype.php:318 +#: include/classes/api/services/CItemPrototype.php:333 #, c-format msgid "Empty application prototype name in item prototype \"%1$s\"." msgstr "Пустое имя прототипа группы элементов данных в прототипе элементов данных \"%1$s\"." @@ -5531,19 +5544,19 @@ msgstr "Пустой ID корреляции." msgid "Empty filter condition formula ID for action \"%1$s\"." msgstr "Пустой ID формулы условия фильтра для действия \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1108 +#: include/classes/api/services/CDiscoveryRule.php:1272 #, c-format msgid "Empty filter condition formula ID for discovery rule \"%1$s\"." msgstr "Пустой ID формулы условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1100 +#: include/classes/api/services/CDiscoveryRule.php:1264 #, c-format msgid "Empty filter condition macro for discovery rule \"%1$s\"." msgstr "Пустой макрос условия фильтра для правила обнаружения \"%1$s\"." #: include/classes/api/services/CCorrelation.php:516 #: include/classes/api/services/CCorrelation.php:693 -#: include/classes/api/services/CDiscoveryRule.php:465 +#: include/classes/api/services/CDiscoveryRule.php:480 #: include/classes/api/services/CDRule.php:187 #: include/classes/api/services/CDRule.php:313 #: include/classes/api/services/CHostInterface.php:383 @@ -5620,7 +5633,7 @@ msgstr "Активировать" msgid "Enable HTTP authentication" msgstr "Активация HTTP аутентификации" -#: app/views/administration.authentication.edit.php:77 +#: app/views/administration.authentication.edit.php:79 msgid "Enable LDAP authentication" msgstr "Активация LDAP аутентификации" @@ -5706,11 +5719,11 @@ msgstr "Активировать выбранные триггеры?" msgid "Enable selected web scenarios?" msgstr "Активировать выбранные веб-сценарии?" -#: include/views/configuration.host.discovery.edit.php:571 -#: include/views/configuration.item.edit.php:843 -#: include/views/configuration.item.massupdate.php:568 -#: include/views/configuration.item.prototype.edit.php:716 -#: include/views/configuration.item.prototype.massupdate.php:549 +#: include/views/configuration.host.discovery.edit.php:560 +#: include/views/configuration.item.edit.php:828 +#: include/views/configuration.item.massupdate.php:450 +#: include/views/configuration.item.prototype.edit.php:705 +#: include/views/configuration.item.prototype.massupdate.php:449 msgid "Enable trapping" msgstr "Активировать трапы" @@ -5740,12 +5753,12 @@ msgstr "Активировать трапы" #: include/views/configuration.correlation.list.php:104 #: include/views/configuration.discovery.edit.php:99 #: include/views/configuration.discovery.list.php:44 -#: include/views/configuration.host.discovery.edit.php:586 +#: include/views/configuration.host.discovery.edit.php:572 #: include/views/configuration.host.edit.php:280 #: include/views/configuration.host.list.php:186 #: include/views/configuration.host.massupdate.php:185 #: include/views/configuration.httpconf.edit.php:143 -#: include/views/configuration.item.edit.php:928 +#: include/views/configuration.item.edit.php:911 #: include/views/configuration.triggers.edit.php:575 msgid "Enabled" msgstr "Активировано" @@ -5778,7 +5791,7 @@ msgstr "Английский (en_US)" msgid "Equals" msgstr "Равно" -#: include/items.inc.php:35 include/views/js/common.item.edit.js.php:730 +#: include/items.inc.php:35 include/views/js/common.item.edit.js.php:321 #: include/views/js/configuration.httpconf.edit.js.php:577 #: include/views/js/configuration.httpconf.edit.js.php:652 msgid "Error" @@ -5859,11 +5872,11 @@ msgstr[2] "Событий обновлено" msgid "Events and alerts" msgstr "События и оповещения" -#: include/forms.inc.php:1889 +#: include/forms.inc.php:2137 msgid "Every day(s)" msgstr "Каждый день(и)" -#: include/forms.inc.php:1902 +#: include/forms.inc.php:2150 msgid "Every week(s)" msgstr "Каждую неделю(и)" @@ -5907,9 +5920,9 @@ msgid "Executed" msgstr "Выполнено" #: include/items.inc.php:1678 -#: include/views/configuration.host.discovery.edit.php:494 -#: include/views/configuration.item.edit.php:641 -#: include/views/configuration.item.prototype.edit.php:573 +#: include/views/configuration.host.discovery.edit.php:483 +#: include/views/configuration.item.edit.php:628 +#: include/views/configuration.item.prototype.edit.php:560 msgid "Executed script" msgstr "Выполняемый скрипт" @@ -5996,8 +6009,8 @@ msgstr "Выражение не может быть пустым" msgid "Expression constructor" msgstr "Конструктор выражения" -#: include/forms.inc.php:1647 include/forms.inc.php:1652 -#: include/forms.inc.php:1660 +#: include/forms.inc.php:1895 include/forms.inc.php:1900 +#: include/forms.inc.php:1908 msgid "Expression syntax error." msgstr "Синтаксическая ошибка в выражении." @@ -6050,7 +6063,7 @@ msgstr "Неудачно" msgid "Failed to create dashboard" msgstr "Ошибка при создании панели" -#: include/views/js/common.item.edit.js.php:732 +#: include/views/js/common.item.edit.js.php:323 #: include/views/js/configuration.httpconf.edit.js.php:654 msgid "Failed to parse URL." msgstr "Ошибка при разборе URL." @@ -6087,7 +6100,7 @@ msgstr "Избранные комплексные экраны" msgid "Feb" msgstr "Фев." -#: include/forms.inc.php:1964 include/func.inc.php:117 +#: include/forms.inc.php:2212 include/func.inc.php:117 #: include/func.inc.php:254 jsLoader.php:134 msgid "February" msgstr "Февраль" @@ -6107,9 +6120,9 @@ msgstr "Поле \"%1$s\" не может быть NULL." #: include/classes/api/services/CDRule.php:318 #: include/classes/api/services/CDRule.php:493 #: include/classes/api/services/CDRule.php:503 -#: include/classes/api/services/CHostGroup.php:897 +#: include/classes/api/services/CHostGroup.php:914 #: include/classes/api/services/CHost.php:743 -#: include/classes/api/services/CTemplate.php:784 +#: include/classes/api/services/CTemplate.php:782 #: include/classes/api/services/CTriggerGeneral.php:236 #: include/classes/validators/CNewValidator.php:255 #: include/validate.inc.php:300 @@ -6246,8 +6259,8 @@ msgstr "Заполнение" msgid "Filter" msgstr "Фильтр" -#: include/views/configuration.host.discovery.edit.php:679 -#: include/views/configuration.host.discovery.edit.php:688 +#: include/views/configuration.host.discovery.edit.php:667 +#: include/views/configuration.host.discovery.edit.php:749 msgid "Filters" msgstr "Фильтры" @@ -6293,21 +6306,21 @@ msgstr "Вписать в карту сети" msgid "Fixed" msgstr "Фиксированное" -#: include/views/configuration.host.discovery.edit.php:523 -#: include/views/configuration.item.edit.php:707 -#: include/views/configuration.item.edit.php:714 -#: include/views/configuration.item.massupdate.php:465 -#: include/views/configuration.item.prototype.edit.php:634 -#: include/views/configuration.item.prototype.massupdate.php:443 +#: include/views/configuration.host.discovery.edit.php:511 +#: include/views/configuration.item.edit.php:694 +#: include/views/configuration.item.edit.php:701 +#: include/views/configuration.item.massupdate.php:347 +#: include/views/configuration.item.prototype.edit.php:621 +#: include/views/configuration.item.prototype.massupdate.php:343 #: include/views/js/common.item.edit.js.php:7 -#: include/views/js/configuration.item.massupdate.js.php:7 +#: include/views/js/configuration.item.massupdate.js.php:11 msgid "Flexible" msgstr "Переменный" #: app/views/popup.httpstep.php:135 -#: include/views/configuration.host.discovery.edit.php:250 -#: include/views/configuration.item.edit.php:282 -#: include/views/configuration.item.prototype.edit.php:270 +#: include/views/configuration.host.discovery.edit.php:244 +#: include/views/configuration.item.edit.php:279 +#: include/views/configuration.item.prototype.edit.php:264 msgid "Follow redirects" msgstr "Следовать перенаправлениям" @@ -6333,8 +6346,8 @@ msgstr "Пароль для Гостя должен быть пустым" msgid "Form data" msgstr "Данные формы" -#: include/items.inc.php:1682 include/views/configuration.item.edit.php:657 -#: include/views/configuration.item.prototype.edit.php:587 +#: include/items.inc.php:1682 include/views/configuration.item.edit.php:644 +#: include/views/configuration.item.prototype.edit.php:574 msgid "Formula" msgstr "Формула" @@ -6346,7 +6359,7 @@ msgstr "Французский (fr_FR)" msgid "Fri" msgstr "Пт" -#: include/forms.inc.php:1932 include/forms.inc.php:2047 +#: include/forms.inc.php:2180 include/forms.inc.php:2295 #: include/func.inc.php:139 include/func.inc.php:229 jsLoader.php:149 msgid "Friday" msgstr "Пятница" @@ -6724,12 +6737,12 @@ msgstr "Сетка" msgid "Group" msgstr "Группа" -#: include/classes/api/services/CHostGroup.php:551 +#: include/classes/api/services/CHostGroup.php:715 #, 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:600 +#: include/classes/api/services/CHostGroup.php:764 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как она используется в условии корреляции." @@ -6819,26 +6832,26 @@ msgstr "HTTP" msgid "HTTP agent" msgstr "HTTP агент" -#: include/views/configuration.host.discovery.edit.php:280 +#: include/views/configuration.host.discovery.edit.php:271 #: include/views/configuration.httpconf.edit.php:154 -#: include/views/configuration.item.edit.php:321 -#: include/views/configuration.item.prototype.edit.php:309 +#: include/views/configuration.item.edit.php:314 +#: include/views/configuration.item.prototype.edit.php:299 msgid "HTTP authentication" msgstr "HTTP аутентификация" -#: app/views/administration.authentication.edit.php:44 +#: app/views/administration.authentication.edit.php:45 msgid "HTTP login form" msgstr "HTTP диалог входа в систему" -#: include/views/configuration.host.discovery.edit.php:271 +#: include/views/configuration.host.discovery.edit.php:263 #: include/views/configuration.httpconf.edit.php:110 #: include/views/configuration.httpconf.list.php:93 -#: include/views/configuration.item.edit.php:312 -#: include/views/configuration.item.prototype.edit.php:300 +#: include/views/configuration.item.edit.php:306 +#: include/views/configuration.item.prototype.edit.php:291 msgid "HTTP proxy" msgstr "HTTP прокси" -#: app/views/administration.authentication.edit.php:136 +#: app/views/administration.authentication.edit.php:146 msgid "HTTP settings" msgstr "Настройки HTTP" @@ -6865,14 +6878,14 @@ msgid "Hardware sensor reading. Returns float" msgstr "Значение аппаратного сенсора. Возвращает число с плавающей точкой" #: app/views/popup.httpstep.php:95 app/views/popup.httpstep.php:143 -#: include/views/configuration.host.discovery.edit.php:201 -#: include/views/configuration.host.discovery.edit.php:262 +#: include/views/configuration.host.discovery.edit.php:197 +#: include/views/configuration.host.discovery.edit.php:255 #: include/views/configuration.httpconf.edit.php:117 -#: include/views/configuration.item.edit.php:233 -#: include/views/configuration.item.edit.php:294 -#: include/views/configuration.item.massupdate.php:149 -#: include/views/configuration.item.prototype.edit.php:221 -#: include/views/configuration.item.prototype.edit.php:282 +#: include/views/configuration.item.edit.php:232 +#: include/views/configuration.item.edit.php:290 +#: include/views/configuration.item.massupdate.php:147 +#: include/views/configuration.item.prototype.edit.php:217 +#: include/views/configuration.item.prototype.edit.php:275 #: include/views/configuration.item.prototype.massupdate.php:143 msgid "Headers" msgstr "Заголовки" @@ -6896,7 +6909,7 @@ msgstr "Высота" msgid "Help" msgstr "Помощь" -#: include/items.inc.php:1759 +#: include/items.inc.php:1757 msgid "Hexadecimal to decimal" msgstr "Шестнадцатеричное в десятичное" @@ -6955,12 +6968,12 @@ msgid "History" msgstr "История" #: httpconf.php:191 httpconf.php:198 httpconf.php:492 httpconf.php:504 -#: items.php:992 items.php:999 items.php:1382 items.php:1394 +#: items.php:992 items.php:999 items.php:1383 items.php:1395 msgid "History cleared" msgstr "История очищена" #: include/views/configuration.httpconf.edit.php:298 -#: include/views/configuration.item.edit.php:1183 +#: include/views/configuration.item.edit.php:945 msgid "History clearing can take a long time. Continue?" msgstr "Очистка истории может занять продолжительное время. Продолжить?" @@ -6981,10 +6994,10 @@ msgstr "Период хранения данных истории \"%1$s\"." msgid "History of events" msgstr "История событий" -#: disc_prototypes.php:193 include/views/configuration.item.edit.php:783 -#: include/views/configuration.item.massupdate.php:518 -#: include/views/configuration.item.prototype.edit.php:680 -#: include/views/configuration.item.prototype.massupdate.php:496 items.php:61 +#: disc_prototypes.php:193 include/views/configuration.item.edit.php:770 +#: include/views/configuration.item.massupdate.php:400 +#: include/views/configuration.item.prototype.edit.php:667 +#: include/views/configuration.item.prototype.massupdate.php:396 items.php:61 msgid "History storage period" msgstr "Период хранения истории" @@ -7041,7 +7054,7 @@ msgstr "Выравнивание по горизонтали" #: include/views/monitoring.screen.constructor.edit.php:524 #: include/views/monitoring.screen.php:78 #: include/views/monitoring.slides.php:74 -#: include/views/reports.toptriggers.php:79 items.php:992 items.php:1381 +#: include/views/reports.toptriggers.php:79 items.php:992 items.php:1382 #: jsLoader.php:165 latest.php:421 latest.php:438 queue.php:254 #: report2.php:409 report2.php:431 msgid "Host" @@ -7057,10 +7070,10 @@ msgstr[2] "Узлы сети" msgid "Host \"%1$s\" already exists." msgstr "Узел сети \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:1449 +#: include/classes/api/services/CHostGroup.php:1466 #: include/classes/api/services/CHost.php:806 -#: include/classes/api/services/CHost.php:1629 -#: include/classes/api/services/CHost.php:1805 +#: include/classes/api/services/CHost.php:1665 +#: include/classes/api/services/CHost.php:1841 #, c-format msgid "Host \"%1$s\" cannot be without host group." msgstr "Узел сети \"%1$s\" не может быть без группы узлов сети." @@ -7134,17 +7147,17 @@ msgstr[2] "Узлы сети активированы" msgid "Host group" msgstr "Группа узлов сети" -#: include/classes/api/services/CHostGroup.php:731 +#: include/classes/api/services/CHostGroup.php:643 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "Группа узлов сети \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:584 +#: include/classes/api/services/CHostGroup.php:748 #, 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:537 +#: include/classes/api/services/CHostGroup.php:701 #, c-format msgid "Host group \"%1$s\" is internal and can not be deleted." msgstr "Группа узлов сети \"%1$s\" является внутренней и не может быть удалена." @@ -7192,11 +7205,11 @@ msgstr "Группы узлов сети" msgid "Host info" msgstr "Информация об узлах сети" -#: include/views/configuration.host.discovery.edit.php:387 -#: include/views/configuration.item.edit.php:435 -#: include/views/configuration.item.edit.php:479 -#: include/views/configuration.item.massupdate.php:85 -#: include/views/configuration.item.prototype.edit.php:466 +#: include/views/configuration.host.discovery.edit.php:366 +#: include/views/configuration.item.edit.php:420 +#: include/views/configuration.item.edit.php:464 +#: include/views/configuration.item.massupdate.php:84 +#: include/views/configuration.item.prototype.edit.php:449 #: include/views/configuration.item.prototype.massupdate.php:80 msgid "Host interface" msgstr "Интерфейс узла сети" @@ -7324,25 +7337,25 @@ msgstr "Узел сети обновлен" msgid "Host with ID \"%1$s\" is not available." msgstr "Узел сети с ID \"%1$s\" недоступен." -#: include/classes/api/services/CTemplate.php:1056 +#: include/classes/api/services/CTemplate.php:1054 #, c-format msgid "Host with the same name \"%1$s\" already exists." msgstr "Узел сети с таким же именем \"%1$s\" уже существует." -#: include/classes/api/services/CHost.php:1736 -#: include/classes/api/services/CHost.php:1955 +#: include/classes/api/services/CHost.php:1772 +#: include/classes/api/services/CHost.php:1991 #, c-format msgid "Host with the same name \"%s\" already exists." msgstr "Узел сети с таким же именем \"%s\" уже существует." #: include/classes/api/services/CTemplate.php:460 -#: include/classes/api/services/CTemplate.php:1021 +#: include/classes/api/services/CTemplate.php:1019 #, c-format msgid "Host with the same visible name \"%1$s\" already exists." msgstr "Узел сети с таким же видимым именем \"%1$s\" уже существует." -#: include/classes/api/services/CHost.php:1742 -#: include/classes/api/services/CHost.php:1962 +#: include/classes/api/services/CHost.php:1778 +#: include/classes/api/services/CHost.php:1998 #, c-format msgid "Host with the same visible name \"%s\" already exists." msgstr "Узел сети с таким же видимым именем \"%s\" уже существует." @@ -7390,7 +7403,7 @@ msgstr "Расположение узлов сети" msgid "Hosts updated" msgstr "Узлы сети обновлены" -#: include/forms.inc.php:2118 +#: include/forms.inc.php:2366 msgid "Hours" msgstr "Часы" @@ -7489,9 +7502,9 @@ msgid "IPMI scripts can be executed only by server." msgstr "IPMI скрипты можно выполнять только на сервере." #: disc_prototypes.php:162 host_discovery.php:136 -#: include/views/configuration.host.discovery.edit.php:452 -#: include/views/configuration.item.edit.php:591 -#: include/views/configuration.item.prototype.edit.php:531 items.php:172 +#: include/views/configuration.host.discovery.edit.php:440 +#: include/views/configuration.item.edit.php:577 +#: include/views/configuration.item.prototype.edit.php:517 items.php:172 msgid "IPMI sensor" msgstr "IPMI датчик" @@ -7671,7 +7684,7 @@ msgstr "В обслуживании" msgid "In progress" msgstr "В работе" -#: include/items.inc.php:1765 +#: include/items.inc.php:1761 msgid "In range" msgstr "" @@ -7691,6 +7704,10 @@ msgstr "Недоступный узел сети" msgid "Inaccessible item" msgstr "Недоступный элемент данных" +#: include/classes/screens/CScreenProblem.php:393 +msgid "Inaccessible maintenance" +msgstr "" + #: app/controllers/CControllerDashboardWidgetEdit.php:103 #: app/controllers/CControllerWidgetNavTreeItemEdit.php:84 msgid "Inaccessible map" @@ -7964,18 +7981,18 @@ msgstr "В функцию переданы некорректные аргуме #: include/classes/api/services/CHostPrototype.php:392 #: include/classes/api/services/CHostPrototype.php:413 #: include/classes/api/services/CItemGeneral.php:258 -#: include/classes/api/services/CItemGeneral.php:1171 -#: include/classes/api/services/CItemGeneral.php:1196 -#: include/classes/api/services/CItemGeneral.php:1219 -#: include/classes/api/services/CItemGeneral.php:1249 -#: include/classes/api/services/CItemGeneral.php:1263 -#: include/classes/api/services/CItemGeneral.php:1289 -#: include/classes/api/services/CItemGeneral.php:1335 -#: include/classes/api/services/CItemGeneral.php:1358 -#: include/classes/api/services/CItemGeneral.php:1409 -#: include/classes/api/services/CItemGeneral.php:1420 -#: include/classes/api/services/CItemGeneral.php:1435 -#: include/classes/api/services/CItemGeneral.php:1446 +#: include/classes/api/services/CItemGeneral.php:1261 +#: include/classes/api/services/CItemGeneral.php:1286 +#: include/classes/api/services/CItemGeneral.php:1309 +#: include/classes/api/services/CItemGeneral.php:1339 +#: include/classes/api/services/CItemGeneral.php:1353 +#: include/classes/api/services/CItemGeneral.php:1379 +#: include/classes/api/services/CItemGeneral.php:1425 +#: include/classes/api/services/CItemGeneral.php:1448 +#: include/classes/api/services/CItemGeneral.php:1499 +#: include/classes/api/services/CItemGeneral.php:1510 +#: include/classes/api/services/CItemGeneral.php:1525 +#: include/classes/api/services/CItemGeneral.php:1536 #: include/classes/api/services/CMapElement.php:46 #: include/classes/api/services/CMapElement.php:90 #: include/classes/api/services/CMapElement.php:109 @@ -8017,8 +8034,8 @@ msgid "Incorrect calculate SLA value for service \"%1$s\"." msgstr "Некорректное вычисляемое значение SLA для услуги \"%1$s\"." #: include/classes/api/services/CHost.php:826 -#: include/classes/api/services/CHost.php:1617 -#: include/classes/api/services/CHost.php:1873 +#: include/classes/api/services/CHost.php:1653 +#: include/classes/api/services/CHost.php:1909 #, c-format msgid "Incorrect characters used for host name \"%s\"." msgstr "Использованы некорректные символы в имени узла сети \"%s\"." @@ -8030,7 +8047,7 @@ msgid "Incorrect characters used for proxy name \"%1$s\"." msgstr "Использованы некорректные символы в имени прокси \"%1$s\"." #: include/classes/api/services/CTemplate.php:411 -#: include/classes/api/services/CTemplate.php:1064 +#: include/classes/api/services/CTemplate.php:1062 #, c-format msgid "Incorrect characters used for template name \"%1$s\"." msgstr "Использованы некорректные символы в имени шаблона \"%1$s\"." @@ -8040,7 +8057,7 @@ msgstr "Использованы некорректные символы в им msgid "Incorrect conditions for action \"%1$s\"." msgstr "Некорректные условия в действии \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1074 +#: include/classes/api/services/CDiscoveryRule.php:1238 #, c-format msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Некорректные условия в правиле обнаружения \"%1$s\"." @@ -8059,7 +8076,7 @@ msgstr "Некорректное пользовательское выражен msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." msgstr "Некорректное пользовательское выражение \"%2$s\" для корреляции \"%1$s\": %3$s." -#: include/classes/api/services/CDiscoveryRule.php:1079 +#: include/classes/api/services/CDiscoveryRule.php:1243 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." msgstr "Некорректное пользовательское выражение \"%2$s\" для правила обнаружения \"%1$s\": %3$s." @@ -8104,7 +8121,7 @@ msgstr "Некорректный загружаемый файл." msgid "Incorrect filter condition formula ID for action \"%1$s\"." msgstr "Некорректный ID формулы условия фильтра для действия \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1109 +#: include/classes/api/services/CDiscoveryRule.php:1273 #, c-format msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Некорректный ID формулы условия фильтра для правила обнаружения \"%1$s\"." @@ -8114,7 +8131,7 @@ msgstr "Некорректный ID формулы условия фильтра msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." msgstr "Задан некорректный ID формулы условия фильтра для корреляции \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1101 +#: include/classes/api/services/CDiscoveryRule.php:1265 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." msgstr "Некорректный макрос условия фильтра для правила обнаружения \"%1$s\"." @@ -8124,7 +8141,7 @@ msgstr "Некорректный макрос условия фильтра дл msgid "Incorrect filter condition operator for action \"%1$s\"." msgstr "Некорректный оператор условия фильтра для действия \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1113 +#: include/classes/api/services/CDiscoveryRule.php:1277 #, c-format msgid "Incorrect filter condition operator for discovery rule \"%1$s\"." msgstr "Некорректный оператор условия фильтра для правила обнаружения \"%1$s\"." @@ -8172,8 +8189,8 @@ msgstr "Некорректный индекс изображения." #: include/classes/api/services/CAction.php:2821 #: include/classes/api/services/CAction.php:2833 #: include/classes/api/services/CHost.php:812 -#: include/classes/api/services/CHost.php:1611 -#: include/classes/api/services/CHost.php:1792 +#: include/classes/api/services/CHost.php:1647 +#: include/classes/api/services/CHost.php:1828 #: include/classes/api/services/CImage.php:485 #: include/classes/api/services/CProxy.php:618 #: include/classes/api/services/CProxy.php:682 @@ -8196,8 +8213,8 @@ msgstr "Для интерфейса указан некорректный пар msgid "Incorrect interface port \"%s\" provided." msgstr "Для интерфейса указан некорректный порт \"%s\"." -#: include/classes/api/services/CHost.php:1711 -#: include/classes/api/services/CHost.php:1855 +#: include/classes/api/services/CHost.php:1747 +#: include/classes/api/services/CHost.php:1891 #, c-format msgid "Incorrect inventory field \"%s\"." msgstr "Некорректное поле \"%s\" инвентарных данных." @@ -8235,7 +8252,7 @@ msgstr "Некорректный тип значений элемента дан msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"." msgstr "Указан некорректный тип элемента данных \"%1$s\" для функции триггера \"%2$s\"." -#: include/forms.inc.php:1393 +#: include/forms.inc.php:1641 msgid "Incorrect list of items." msgstr "Некорректный список элементов данных." @@ -8392,8 +8409,8 @@ msgstr "Некорректный порядок сортировки у услу msgid "Incorrect source value." msgstr "Некорректное значение источника." -#: include/classes/api/services/CHost.php:1683 -#: include/classes/api/services/CHost.php:1823 +#: include/classes/api/services/CHost.php:1719 +#: include/classes/api/services/CHost.php:1859 #, c-format msgid "Incorrect status for host \"%1$s\"." msgstr "Некорректное состояние для узла сети \"%1$s\"." @@ -8466,7 +8483,7 @@ msgstr "Некорректный тип вычисления для действ msgid "Incorrect type of calculation for correlation \"%1$s\"." msgstr "Некорректный тип вычисления для корреляции \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1067 +#: include/classes/api/services/CDiscoveryRule.php:1231 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." msgstr "Некорректный тип вычисления для правила обнаружения \"%1$s\"." @@ -8506,7 +8523,7 @@ msgstr "Некорректная группа пользователей." #: include/classes/api/services/CAction.php:1745 #: include/classes/api/services/CAction.php:2777 #: include/classes/api/services/CAction.php:2921 -#: include/classes/api/services/CDiscoveryRule.php:1015 +#: include/classes/api/services/CDiscoveryRule.php:1179 #: include/classes/api/services/CDRule.php:237 #: include/classes/api/services/CDRule.php:244 #: include/classes/api/services/CDRule.php:292 @@ -8517,7 +8534,7 @@ msgstr "Некорректная группа пользователей." #: include/classes/api/services/CDRule.php:558 #: include/classes/api/services/CDRule.php:571 #: include/classes/api/services/CItemGeneral.php:529 -#: include/classes/api/services/CItemGeneral.php:2206 +#: include/classes/api/services/CItemGeneral.php:2169 #: include/classes/validators/CNewValidator.php:116 #: include/classes/validators/CNewValidator.php:129 #: include/classes/validators/CNewValidator.php:142 @@ -8532,7 +8549,7 @@ msgstr "Некорректная группа пользователей." msgid "Incorrect value \"%1$s\" for \"%2$s\" field." msgstr "Некорректное значение \"%1$s\" для \"%2$s\" поля." -#: app/controllers/CControllerAuthenticationUpdate.php:132 +#: app/controllers/CControllerAuthenticationUpdate.php:134 #: include/classes/api/services/CAction.php:1678 #: include/classes/api/services/CScreenItem.php:576 #: include/validate.inc.php:351 @@ -8615,8 +8632,8 @@ msgstr "" #: include/classes/api/services/CCorrelation.php:1101 #: include/classes/api/services/CCorrelation.php:1118 #: include/classes/api/services/CCorrelation.php:1137 -#: include/classes/api/services/CDiscoveryRule.php:1135 -#: include/classes/api/services/CDiscoveryRule.php:1359 +#: include/classes/api/services/CDiscoveryRule.php:1299 +#: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDRule.php:203 #: include/classes/api/services/CDRule.php:209 #: include/classes/api/services/CDRule.php:214 @@ -8636,21 +8653,19 @@ msgstr "" #: include/classes/api/services/CEvent.php:804 #: include/classes/api/services/CEvent.php:847 #: include/classes/api/services/CEvent.php:904 -#: include/classes/api/services/CHostGeneral.php:1023 -#: include/classes/api/services/CHostGeneral.php:1030 #: include/classes/api/services/CHost.php:770 -#: include/classes/api/services/CHost.php:1515 -#: include/classes/api/services/CHost.php:1521 -#: include/classes/api/services/CHost.php:1536 -#: include/classes/api/services/CHost.php:1542 -#: include/classes/api/services/CHost.php:1547 -#: include/classes/api/services/CHost.php:1553 -#: include/classes/api/services/CHost.php:1561 -#: include/classes/api/services/CHost.php:1567 -#: include/classes/api/services/CHost.php:1576 -#: include/classes/api/services/CHost.php:1582 -#: include/classes/api/services/CHost.php:1677 -#: include/classes/api/services/CHost.php:1817 +#: include/classes/api/services/CHost.php:1551 +#: include/classes/api/services/CHost.php:1557 +#: include/classes/api/services/CHost.php:1572 +#: include/classes/api/services/CHost.php:1578 +#: include/classes/api/services/CHost.php:1583 +#: include/classes/api/services/CHost.php:1589 +#: include/classes/api/services/CHost.php:1597 +#: include/classes/api/services/CHost.php:1603 +#: include/classes/api/services/CHost.php:1612 +#: include/classes/api/services/CHost.php:1618 +#: include/classes/api/services/CHost.php:1713 +#: include/classes/api/services/CHost.php:1853 #: include/classes/api/services/CHttpTest.php:967 #: include/classes/api/services/CHttpTest.php:982 #: include/classes/api/services/CHttpTest.php:1076 @@ -8664,40 +8679,36 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:517 #: include/classes/api/services/CItemGeneral.php:523 #: include/classes/api/services/CItemGeneral.php:536 -#: include/classes/api/services/CItemGeneral.php:1201 -#: include/classes/api/services/CItemGeneral.php:1207 -#: include/classes/api/services/CItemGeneral.php:1223 -#: include/classes/api/services/CItemGeneral.php:1232 -#: include/classes/api/services/CItemGeneral.php:1254 -#: include/classes/api/services/CItemGeneral.php:1268 -#: include/classes/api/services/CItemGeneral.php:1275 -#: include/classes/api/services/CItemGeneral.php:1281 -#: include/classes/api/services/CItemGeneral.php:1294 -#: include/classes/api/services/CItemGeneral.php:1305 -#: include/classes/api/services/CItemGeneral.php:1315 +#: include/classes/api/services/CItemGeneral.php:1291 +#: include/classes/api/services/CItemGeneral.php:1297 +#: include/classes/api/services/CItemGeneral.php:1313 #: include/classes/api/services/CItemGeneral.php:1322 -#: include/classes/api/services/CItemGeneral.php:1340 -#: include/classes/api/services/CItemGeneral.php:1363 -#: include/classes/api/services/CItemGeneral.php:1413 -#: include/classes/api/services/CItemGeneral.php:1426 -#: include/classes/api/services/CItemGeneral.php:1439 -#: include/classes/api/services/CItemGeneral.php:1454 -#: include/classes/api/services/CItemGeneral.php:1464 -#: include/classes/api/services/CItemGeneral.php:1688 -#: include/classes/api/services/CItemGeneral.php:1729 -#: include/classes/api/services/CItemGeneral.php:1735 -#: include/classes/api/services/CItemGeneral.php:1752 -#: include/classes/api/services/CItemGeneral.php:1759 -#: include/classes/api/services/CItemGeneral.php:1765 -#: include/classes/api/services/CItemGeneral.php:1850 -#: include/classes/api/services/CItemGeneral.php:1859 -#: include/classes/api/services/CItemGeneral.php:1972 -#: include/classes/api/services/CItemGeneral.php:1979 -#: include/classes/api/services/CItemGeneral.php:2145 -#: include/classes/api/services/CItem.php:774 -#: include/classes/api/services/CItem.php:782 -#: include/classes/api/services/CItemPrototype.php:944 -#: include/classes/api/services/CItemPrototype.php:952 +#: include/classes/api/services/CItemGeneral.php:1344 +#: include/classes/api/services/CItemGeneral.php:1358 +#: include/classes/api/services/CItemGeneral.php:1365 +#: include/classes/api/services/CItemGeneral.php:1371 +#: include/classes/api/services/CItemGeneral.php:1384 +#: include/classes/api/services/CItemGeneral.php:1395 +#: include/classes/api/services/CItemGeneral.php:1405 +#: include/classes/api/services/CItemGeneral.php:1412 +#: include/classes/api/services/CItemGeneral.php:1430 +#: include/classes/api/services/CItemGeneral.php:1453 +#: include/classes/api/services/CItemGeneral.php:1503 +#: include/classes/api/services/CItemGeneral.php:1516 +#: include/classes/api/services/CItemGeneral.php:1529 +#: include/classes/api/services/CItemGeneral.php:1544 +#: include/classes/api/services/CItemGeneral.php:1554 +#: include/classes/api/services/CItemGeneral.php:1810 +#: include/classes/api/services/CItemGeneral.php:1830 +#: include/classes/api/services/CItemGeneral.php:1837 +#: include/classes/api/services/CItemGeneral.php:1847 +#: include/classes/api/services/CItemGeneral.php:1927 +#: include/classes/api/services/CItemGeneral.php:1941 +#: include/classes/api/services/CItemGeneral.php:2108 +#: include/classes/api/services/CItem.php:787 +#: include/classes/api/services/CItem.php:795 +#: include/classes/api/services/CItemPrototype.php:958 +#: include/classes/api/services/CItemPrototype.php:966 #: include/classes/api/services/CMaintenance.php:468 #: include/classes/api/services/CMaintenance.php:637 #: include/classes/api/services/CMapElement.php:74 @@ -8763,12 +8774,12 @@ msgstr "" #: include/classes/helpers/CSvgGraphHelper.php:248 #: include/classes/import/CConfigurationImport.php:807 #: include/classes/import/CConfigurationImport.php:845 -#: include/classes/import/CConfigurationImport.php:2460 -#: include/classes/import/CConfigurationImport.php:2564 -#: include/classes/import/CConfigurationImport.php:2574 -#: include/classes/import/CConfigurationImport.php:2610 -#: include/classes/import/CConfigurationImport.php:2619 -#: include/classes/import/CConfigurationImport.php:2625 +#: include/classes/import/CConfigurationImport.php:2468 +#: include/classes/import/CConfigurationImport.php:2572 +#: include/classes/import/CConfigurationImport.php:2582 +#: include/classes/import/CConfigurationImport.php:2618 +#: include/classes/import/CConfigurationImport.php:2627 +#: include/classes/import/CConfigurationImport.php:2633 #: include/classes/validators/CNewValidator.php:91 #: include/classes/validators/CNewValidator.php:101 #: include/classes/validators/CNewValidator.php:266 @@ -8781,7 +8792,7 @@ msgstr "" msgid "Incorrect value for field \"%1$s\": %2$s." msgstr "Некорректное значение для поля \"%1$s\": %2$s." -#: app/controllers/CControllerAuthenticationUpdate.php:124 +#: app/controllers/CControllerAuthenticationUpdate.php:126 #: app/controllers/CControllerPopupTriggerWizard.php:125 #: include/validate.inc.php:346 #, c-format @@ -8949,15 +8960,15 @@ msgid "Internet Explorer" msgstr "Internet Explorer" #: include/forms.inc.php:882 include/views/configuration.discovery.list.php:62 -#: include/views/configuration.host.discovery.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:506 #: include/views/configuration.host.discovery.list.php:57 #: include/views/configuration.httpconf.list.php:90 -#: include/views/configuration.item.edit.php:700 +#: include/views/configuration.item.edit.php:687 #: include/views/configuration.item.list.php:66 -#: include/views/configuration.item.massupdate.php:456 -#: include/views/configuration.item.prototype.edit.php:629 +#: include/views/configuration.item.massupdate.php:338 +#: include/views/configuration.item.prototype.edit.php:616 #: include/views/configuration.item.prototype.list.php:54 -#: include/views/configuration.item.prototype.massupdate.php:434 +#: include/views/configuration.item.prototype.massupdate.php:334 #: include/views/configuration.services.edit.php:170 latest.php:423 msgid "Interval" msgstr "Интервал" @@ -9048,24 +9059,24 @@ msgstr "Ошибочный период хранения внутренних д #: disc_prototypes.php:394 disc_prototypes.php:399 disc_prototypes.php:412 #: disc_prototypes.php:730 disc_prototypes.php:735 disc_prototypes.php:748 -#: host_discovery.php:310 host_discovery.php:315 host_discovery.php:328 +#: host_discovery.php:315 host_discovery.php:320 host_discovery.php:333 #: items.php:617 items.php:622 items.php:635 items.php:1025 items.php:1030 #: items.php:1043 #, c-format msgid "Invalid interval \"%1$s\"." msgstr "Некорректный интервал \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:37 +#: include/classes/api/services/CDiscoveryRule.php:48 #, c-format msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s." msgstr "Ошибочный ключ \"%1$s\" для правила обнаружения \"%2$s\" у \"%3$s\": %4$s." -#: include/classes/api/services/CItem.php:37 +#: include/classes/api/services/CItem.php:52 #, c-format msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s." msgstr "Ошибочный ключ \"%1$s\" для элемента данных \"%2$s\" у \"%3$s\": %4$s." -#: include/classes/api/services/CItemPrototype.php:37 +#: include/classes/api/services/CItemPrototype.php:52 #, c-format msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s." msgstr "Ошибочный ключ \"%1$s\" для прототипа элементов данных \"%2$s\" у \"%3$s\": %4$s." @@ -9108,65 +9119,72 @@ msgstr "Ошибочное количество параметров." #: app/controllers/CControllerDashboardUpdate.php:125 #: app/controllers/CControllerDashboardUpdate.php:134 #: app/controllers/CControllerDashboardUpdate.php:142 -#: include/classes/api/services/CItemGeneral.php:2161 -#: include/classes/api/services/CItemGeneral.php:2168 -#: include/classes/api/services/CItemGeneral.php:2176 -#: include/classes/api/services/CItemGeneral.php:2185 -#: include/classes/api/services/CItemGeneral.php:2192 +#: include/classes/api/services/CDiscoveryRule.php:1319 +#: include/classes/api/services/CDiscoveryRule.php:1405 +#: include/classes/api/services/CDiscoveryRule.php:1422 +#: include/classes/api/services/CDiscoveryRule.php:1440 +#: include/classes/api/services/CDiscoveryRule.php:1448 +#: include/classes/api/services/CItemGeneral.php:2124 +#: include/classes/api/services/CItemGeneral.php:2131 +#: include/classes/api/services/CItemGeneral.php:2139 +#: include/classes/api/services/CItemGeneral.php:2148 +#: include/classes/api/services/CItemGeneral.php:2155 #: include/classes/api/services/CUser.php:649 #: include/classes/api/services/CUser.php:660 -#: include/classes/validators/CApiInputValidator.php:230 -#: include/classes/validators/CApiInputValidator.php:235 -#: include/classes/validators/CApiInputValidator.php:240 -#: include/classes/validators/CApiInputValidator.php:270 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:338 -#: include/classes/validators/CApiInputValidator.php:370 -#: include/classes/validators/CApiInputValidator.php:375 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:422 -#: include/classes/validators/CApiInputValidator.php:475 -#: include/classes/validators/CApiInputValidator.php:508 -#: include/classes/validators/CApiInputValidator.php:513 -#: include/classes/validators/CApiInputValidator.php:554 -#: include/classes/validators/CApiInputValidator.php:559 -#: include/classes/validators/CApiInputValidator.php:564 -#: include/classes/validators/CApiInputValidator.php:593 -#: include/classes/validators/CApiInputValidator.php:648 -#: include/classes/validators/CApiInputValidator.php:655 -#: include/classes/validators/CApiInputValidator.php:682 -#: include/classes/validators/CApiInputValidator.php:727 -#: include/classes/validators/CApiInputValidator.php:756 -#: include/classes/validators/CApiInputValidator.php:761 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:803 -#: include/classes/validators/CApiInputValidator.php:846 -#: include/classes/validators/CApiInputValidator.php:855 -#: include/classes/validators/CApiInputValidator.php:861 -#: include/classes/validators/CApiInputValidator.php:889 -#: include/classes/validators/CApiInputValidator.php:899 -#: include/classes/validators/CApiInputValidator.php:905 -#: include/classes/validators/CApiInputValidator.php:941 -#: include/classes/validators/CApiInputValidator.php:952 -#: include/classes/validators/CApiInputValidator.php:959 -#: include/classes/validators/CApiInputValidator.php:986 -#: include/classes/validators/CApiInputValidator.php:996 -#: include/classes/validators/CApiInputValidator.php:1021 -#: include/classes/validators/CApiInputValidator.php:1026 -#: include/classes/validators/CApiInputValidator.php:1052 +#: include/classes/validators/CApiInputValidator.php:234 +#: include/classes/validators/CApiInputValidator.php:239 +#: include/classes/validators/CApiInputValidator.php:244 +#: include/classes/validators/CApiInputValidator.php:274 +#: include/classes/validators/CApiInputValidator.php:335 +#: include/classes/validators/CApiInputValidator.php:342 +#: include/classes/validators/CApiInputValidator.php:374 +#: include/classes/validators/CApiInputValidator.php:379 +#: include/classes/validators/CApiInputValidator.php:421 +#: include/classes/validators/CApiInputValidator.php:426 +#: include/classes/validators/CApiInputValidator.php:479 +#: include/classes/validators/CApiInputValidator.php:512 +#: include/classes/validators/CApiInputValidator.php:517 +#: include/classes/validators/CApiInputValidator.php:558 +#: include/classes/validators/CApiInputValidator.php:563 +#: include/classes/validators/CApiInputValidator.php:568 +#: include/classes/validators/CApiInputValidator.php:597 +#: include/classes/validators/CApiInputValidator.php:652 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:686 +#: include/classes/validators/CApiInputValidator.php:731 +#: include/classes/validators/CApiInputValidator.php:760 +#: include/classes/validators/CApiInputValidator.php:765 +#: include/classes/validators/CApiInputValidator.php:802 +#: include/classes/validators/CApiInputValidator.php:807 +#: include/classes/validators/CApiInputValidator.php:850 +#: include/classes/validators/CApiInputValidator.php:859 +#: include/classes/validators/CApiInputValidator.php:865 +#: include/classes/validators/CApiInputValidator.php:893 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:909 +#: include/classes/validators/CApiInputValidator.php:945 +#: include/classes/validators/CApiInputValidator.php:956 +#: include/classes/validators/CApiInputValidator.php:963 +#: include/classes/validators/CApiInputValidator.php:990 +#: include/classes/validators/CApiInputValidator.php:1000 +#: include/classes/validators/CApiInputValidator.php:1025 +#: include/classes/validators/CApiInputValidator.php:1030 +#: include/classes/validators/CApiInputValidator.php:1054 #: include/classes/validators/CApiInputValidator.php:1059 -#: include/classes/validators/CApiInputValidator.php:1086 -#: include/classes/validators/CApiInputValidator.php:1093 -#: include/classes/validators/CApiInputValidator.php:1120 -#: include/classes/validators/CApiInputValidator.php:1129 -#: include/classes/validators/CApiInputValidator.php:1174 -#: include/classes/validators/CApiInputValidator.php:1185 +#: include/classes/validators/CApiInputValidator.php:1085 +#: include/classes/validators/CApiInputValidator.php:1092 +#: include/classes/validators/CApiInputValidator.php:1119 +#: include/classes/validators/CApiInputValidator.php:1126 +#: include/classes/validators/CApiInputValidator.php:1153 +#: include/classes/validators/CApiInputValidator.php:1162 +#: include/classes/validators/CApiInputValidator.php:1207 #: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1273 -#: include/classes/validators/CApiInputValidator.php:1360 -#: include/classes/validators/CApiInputValidator.php:1365 -#: include/classes/validators/CApiInputValidator.php:1392 -#: include/classes/validators/CApiInputValidator.php:1397 +#: include/classes/validators/CApiInputValidator.php:1251 +#: include/classes/validators/CApiInputValidator.php:1306 +#: include/classes/validators/CApiInputValidator.php:1393 +#: include/classes/validators/CApiInputValidator.php:1398 +#: include/classes/validators/CApiInputValidator.php:1425 +#: include/classes/validators/CApiInputValidator.php:1430 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:133 #: include/classes/widgets/forms/CWidgetFormMap.php:101 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:479 @@ -9208,7 +9226,7 @@ msgstr "Ошибочный второй параметр." #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 #: include/classes/import/validators/CXmlValidatorGeneral.php:90 #: include/classes/import/validators/CXmlValidatorGeneral.php:105 #: include/classes/import/validators/CXmlValidatorGeneral.php:124 @@ -9299,12 +9317,12 @@ msgstr "Итальянский (it_IT)" #: include/classes/screens/CScreenPlainText.php:42 #: include/classes/widgets/forms/CWidgetFormClock.php:48 #: include/classes/widgets/forms/CWidgetFormGraph.php:48 -#: include/forms.inc.php:1119 include/views/configuration.graph.edit.php:157 +#: include/forms.inc.php:1116 include/views/configuration.graph.edit.php:157 #: include/views/configuration.graph.edit.php:238 #: include/views/monitoring.screen.constructor.edit.php:258 #: include/views/monitoring.screen.constructor.edit.php:427 #: include/views/monitoring.screen.constructor.edit.php:773 items.php:991 -#: items.php:1381 +#: items.php:1382 msgid "Item" msgstr "Элемент данных" @@ -9314,17 +9332,17 @@ msgid "Item \"%1$s\"" msgstr "Элемент данных \"%1$s\"" #: include/classes/api/services/CHostPrototype.php:973 -#: include/classes/api/services/CItem.php:35 +#: include/classes/api/services/CItem.php:50 #, c-format msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "Элемент данных \"%1$s\" уже существует у \"%2$s\", унаследован из другого шаблона." -#: include/classes/api/services/CItem.php:36 +#: include/classes/api/services/CItem.php:51 #, c-format msgid "Item \"%1$s\" already exists on \"%2$s\"." msgstr "Элемент данных \"%1$s\" уже существует у \"%2$s\"." -#: include/classes/api/services/CItem.php:954 +#: include/classes/api/services/CItem.php:904 #, c-format 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." @@ -9334,8 +9352,8 @@ msgstr "Элемент данных \"%1$s\" не может заполнять msgid "Item \"%1$s\" does not exist on template \"%2$s\"." msgstr "Элемент данных \"%1$s\" не существует у шаблона \"%2$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1360 -#: include/classes/api/services/CItemGeneral.php:1689 +#: include/classes/api/services/CDiscoveryRule.php:1666 +#: include/classes/api/services/CItemGeneral.php:1811 #, c-format msgid "Item \"%1$s\" does not exist or you have no access to this item" msgstr "Элемент данных \"%1$s\" не существует или у вас нет прав доступа к нему" @@ -9359,7 +9377,7 @@ msgstr "У элемента данных \"%1$s:%2$s\" ошибочный пор msgid "Item added" msgstr "Элемент данных добавлен" -#: items.php:1349 +#: items.php:1350 msgid "Item copied" msgid_plural "Items copied" msgstr[0] "Элемент даных скопирован" @@ -9374,14 +9392,14 @@ msgstr "Количество элементов данных" msgid "Item deleted" msgstr "Элемент данных удален" -#: applications.php:172 items.php:1307 +#: applications.php:172 items.php:1308 msgid "Item disabled" msgid_plural "Items disabled" msgstr[0] "Элемент данных деактивирован" msgstr[1] "Элементы данных деактивированы" msgstr[2] "Элементы данных деактивированы" -#: applications.php:171 items.php:1306 +#: applications.php:171 items.php:1307 msgid "Item enabled" msgid_plural "Items enabled" msgstr[0] "Элемент данных активирован" @@ -9396,31 +9414,27 @@ msgstr "Элемент данных в \"неподдерживаемом\" со msgid "Item not selected" msgstr "Элемент данных не выбран" -#: include/classes/api/services/CItemGeneral.php:1191 +#: include/classes/api/services/CItemGeneral.php:1281 #, c-format msgid "Item pre-processing is missing parameters: %1$s" msgstr "Отсутствуют параметры у предобработки элемента данных: %1$s" -#: include/classes/api/services/CDiscoveryRule.php:1140 -msgid "Item pre-processing is not allowed for discovery rules." -msgstr "Предобработка элементов данных не разрешена для правил обнаружения." - -#: include/audit.inc.php:39 include/forms.inc.php:1119 +#: include/audit.inc.php:39 include/forms.inc.php:1116 #: include/views/monitoring.screen.constructor.edit.php:351 msgid "Item prototype" msgstr "Прототип элемента данных" -#: include/classes/api/services/CItemPrototype.php:35 +#: include/classes/api/services/CItemPrototype.php:50 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "Прототип элемента данных \"%1$s\" уже существует у \"%2$s\", унаследован из другого шаблона." -#: include/classes/api/services/CItemGeneral.php:1006 +#: include/classes/api/services/CItemGeneral.php:1041 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\", linked to another rule." msgstr "Прототип элемента данных \"%1$s\" уже существует у \"%2$s\", присоединен к другому правилу." -#: include/classes/api/services/CItemPrototype.php:36 +#: include/classes/api/services/CItemPrototype.php:51 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\"." msgstr "Прототип элементов данных \"%1$s\" уже существует у \"%2$s\"." @@ -9459,7 +9473,7 @@ msgstr "Прототипы элементов данных" msgid "Item prototypes deleted" msgstr "Прототип элементов данных удален" -#: disc_prototypes.php:1103 +#: disc_prototypes.php:1116 msgid "Item prototypes updated" msgstr "" @@ -9496,32 +9510,32 @@ msgstr "Элемент данных не будет обновляться. Ин msgid "Item with ID \"%1$s\" is not available." msgstr "Элемент данных с ID \"%1$s\" недоступен." -#: include/classes/api/services/CItemGeneral.php:721 +#: include/classes/api/services/CItemGeneral.php:670 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule." msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как правило обнаружения." -#: include/classes/api/services/CItemGeneral.php:727 +#: include/classes/api/services/CItemGeneral.php:676 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype." msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как элемент данных созданный из прототипа элементов данных." -#: include/classes/api/services/CItemGeneral.php:724 +#: include/classes/api/services/CItemGeneral.php:673 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype." msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как прототип элемента данных." -#: include/classes/api/services/CItemGeneral.php:718 +#: include/classes/api/services/CItemGeneral.php:667 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item." msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как элемент данных." -#: include/classes/api/services/CItemGeneral.php:730 +#: include/classes/api/services/CItemGeneral.php:679 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element." msgstr "Элемент данных с ключем \"%1$s\" уже существует у \"%2$s\", как неизвестный элемент данных." -#: include/classes/api/services/CItemGeneral.php:1581 +#: include/classes/api/services/CItemGeneral.php:1671 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\"." msgstr "Элемент данных с ключом \"%1$s\" уже существует у \"%2$s\"." @@ -9545,11 +9559,11 @@ msgstr "Элемент данных с ключом \"%1$s\" уже сущест #: include/views/configuration.template.list.php:87 #: include/views/configuration.template.list.php:188 #: include/views/conf.import.php:34 include/views/inventory.host.view.php:151 -#: include/views/inventory.host.view.php:162 items.php:1701 queue.php:109 +#: include/views/inventory.host.view.php:162 items.php:1712 queue.php:109 msgid "Items" msgstr "Элементы данных" -#: items.php:1404 +#: items.php:1405 msgid "Items deleted" msgstr "Элементы данных удалены" @@ -9561,7 +9575,7 @@ msgstr "Список элементов данных" msgid "Items location" msgstr "Размещение элементов данных" -#: items.php:1286 +#: items.php:1287 msgid "Items updated" msgstr "Элементы данных обновлены" @@ -9573,10 +9587,10 @@ msgstr "JMX" msgid "JMX agent" msgstr "JMX агент" -#: include/views/configuration.host.discovery.edit.php:465 -#: include/views/configuration.item.edit.php:612 +#: include/views/configuration.host.discovery.edit.php:454 +#: include/views/configuration.item.edit.php:599 #: include/views/configuration.item.massupdate.php:97 -#: include/views/configuration.item.prototype.edit.php:544 +#: include/views/configuration.item.prototype.edit.php:531 #: include/views/configuration.item.prototype.massupdate.php:93 msgid "JMX endpoint" msgstr "JMX endpoint" @@ -9588,14 +9602,10 @@ msgstr "JMX endpoint" msgid "JMX interfaces" msgstr "Интерфейсы JMX" -#: include/items.inc.php:1738 -msgid "JSON Path" -msgstr "Путь JSON" - -#: include/views/configuration.host.discovery.edit.php:172 -#: include/views/configuration.item.edit.php:204 -#: include/views/configuration.item.massupdate.php:119 -#: include/views/configuration.item.prototype.edit.php:192 +#: include/views/configuration.host.discovery.edit.php:168 +#: include/views/configuration.item.edit.php:203 +#: include/views/configuration.item.massupdate.php:117 +#: include/views/configuration.item.prototype.edit.php:188 #: include/views/configuration.item.prototype.massupdate.php:113 msgid "JSON data" msgstr "JSON данные" @@ -9621,6 +9631,11 @@ msgstr "Параметры JSON-rpc не являются массивом." msgid "JSON-rpc version is not specified." msgstr "Версия JSON-rpc не указана." +#: include/items.inc.php:1733 +#: include/views/configuration.host.discovery.edit.php:681 +msgid "JSONPath" +msgstr "" + #: app/views/administration.mediatype.edit.php:53 include/media.inc.php:27 msgid "Jabber" msgstr "Jabber" @@ -9634,7 +9649,7 @@ msgstr "Идентификатор Jabber" msgid "Jan" msgstr "Янв" -#: include/forms.inc.php:1956 include/func.inc.php:116 +#: include/forms.inc.php:2204 include/func.inc.php:116 #: include/func.inc.php:253 jsLoader.php:133 msgid "January" msgstr "Январь" @@ -9647,7 +9662,7 @@ msgstr "Японский (ja_JP)" msgid "Jul" msgstr "Июл" -#: include/forms.inc.php:1959 include/func.inc.php:122 +#: include/forms.inc.php:2207 include/func.inc.php:122 #: include/func.inc.php:259 jsLoader.php:139 msgid "July" msgstr "Июль" @@ -9656,12 +9671,12 @@ msgstr "Июль" msgid "Jun" msgstr "Июн" -#: include/forms.inc.php:1996 include/func.inc.php:121 +#: include/forms.inc.php:2244 include/func.inc.php:121 #: include/func.inc.php:258 jsLoader.php:138 msgid "June" msgstr "Июнь" -#: include/views/configuration.host.discovery.edit.php:565 +#: include/views/configuration.host.discovery.edit.php:554 msgid "Keep lost resources period" msgstr "Период сохранения потерянных ресурсов" @@ -9669,11 +9684,11 @@ msgstr "Период сохранения потерянных ресурсов" #: app/controllers/CControllerPopupGeneric.php:222 #: app/controllers/CControllerPopupGeneric.php:274 disc_prototypes.php:46 #: host_discovery.php:50 include/forms.inc.php:469 -#: include/views/configuration.host.discovery.edit.php:68 +#: include/views/configuration.host.discovery.edit.php:67 #: include/views/configuration.host.discovery.list.php:56 -#: include/views/configuration.item.edit.php:104 +#: include/views/configuration.item.edit.php:106 #: include/views/configuration.item.list.php:65 -#: include/views/configuration.item.prototype.edit.php:93 +#: include/views/configuration.item.prototype.edit.php:92 #: include/views/configuration.item.prototype.list.php:53 #: include/views/js/configuration.discovery.edit.js.php:56 items.php:47 msgid "Key" @@ -9687,7 +9702,7 @@ msgstr "Ключ \"%1$s\" не совпадает с <grpmax|grpmin|grpsum|grpav #: include/views/configuration.action.edit.php:987 #: include/views/configuration.action.edit.php:1774 #: include/views/configuration.action.edit.php:2229 -#: include/views/js/common.item.edit.js.php:518 +#: include/views/js/common.item.edit.js.php:248 msgid "Key passphrase" msgstr "Фраза-пароль ключа" @@ -9713,7 +9728,7 @@ msgstr "LDAP" msgid "LDAP authentication" msgstr "LDAP аутентификация" -#: app/views/administration.authentication.edit.php:83 +#: app/views/administration.authentication.edit.php:86 msgid "LDAP host" msgstr "Хост LDAP" @@ -9721,18 +9736,27 @@ msgstr "Хост LDAP" msgid "LDAP is not configured" msgstr "LDAP не настроен" -#: app/controllers/CControllerAuthenticationUpdate.php:180 +#: app/controllers/CControllerAuthenticationUpdate.php:182 msgid "LDAP login successful" msgstr "Успешный вход через LDAP" -#: app/views/administration.authentication.edit.php:137 +#: app/views/administration.authentication.edit.php:147 msgid "LDAP settings" msgstr "Настройки LDAP" +#: include/views/configuration.host.discovery.edit.php:681 +msgid "LLD macro" +msgstr "" + +#: include/views/configuration.host.discovery.edit.php:733 +#: include/views/configuration.host.discovery.edit.php:748 +msgid "LLD macros" +msgstr "" + #: include/maps.inc.php:45 include/views/configuration.action.edit.php:51 #: include/views/configuration.action.edit.php:1100 #: include/views/configuration.correlation.edit.php:48 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/js/monitoring.sysmaps.js.php:111 #: include/views/js/monitoring.sysmaps.js.php:582 #: include/views/js/monitoring.sysmaps.js.php:690 @@ -9899,7 +9923,7 @@ msgstr "По левой стороне" msgid "Left Y" msgstr "Ось Y слева" -#: include/items.inc.php:1731 +#: include/items.inc.php:1725 msgid "Left trim" msgstr "Обрезать слева" @@ -10069,9 +10093,9 @@ msgid "Location longitude" msgstr "Размещение (долгота)" #: include/forms.inc.php:354 include/items.inc.php:133 -#: include/views/configuration.item.edit.php:679 -#: include/views/configuration.item.massupdate.php:280 -#: include/views/configuration.item.prototype.edit.php:608 +#: include/views/configuration.item.edit.php:666 +#: include/views/configuration.item.massupdate.php:268 +#: include/views/configuration.item.prototype.edit.php:595 #: include/views/configuration.item.prototype.massupdate.php:263 msgid "Log" msgstr "Журнал (лог)" @@ -10084,10 +10108,10 @@ msgstr "Мониторинг файлов журналов с поддержко msgid "Log file monitoring. Returns log" msgstr "Мониторинг файлов журналов логов. Возвращает лог" -#: include/views/configuration.item.edit.php:813 -#: include/views/configuration.item.massupdate.php:544 -#: include/views/configuration.item.prototype.edit.php:692 -#: include/views/configuration.item.prototype.massupdate.php:525 +#: include/views/configuration.item.edit.php:798 +#: include/views/configuration.item.massupdate.php:427 +#: include/views/configuration.item.prototype.edit.php:679 +#: include/views/configuration.item.prototype.massupdate.php:425 msgid "Log time format" msgstr "Формат времени в журнале (логе)" @@ -10095,7 +10119,7 @@ msgstr "Формат времени в журнале (логе)" msgid "Log unmatched SNMP traps" msgstr "Журналировать не совпадающие SNMP трапы" -#: app/views/administration.authentication.edit.php:115 auditlogs.php:138 +#: app/views/administration.authentication.edit.php:123 auditlogs.php:138 #: include/func.inc.php:1790 include/func.inc.php:1805 #: include/menu.inc.php:294 include/views/administration.auditlogs.list.php:44 #: include/views/administration.users.list.php:89 index_http.php:91 @@ -10150,11 +10174,11 @@ msgid "MD2" msgstr "MD2" #: include/hosts.inc.php:34 -#: include/views/configuration.host.discovery.edit.php:426 -#: include/views/configuration.item.edit.php:536 -#: include/views/configuration.item.edit.php:543 -#: include/views/configuration.item.massupdate.php:225 -#: include/views/configuration.item.prototype.edit.php:505 +#: include/views/configuration.host.discovery.edit.php:414 +#: include/views/configuration.item.edit.php:522 +#: include/views/configuration.item.edit.php:529 +#: include/views/configuration.item.massupdate.php:218 +#: include/views/configuration.item.prototype.edit.php:491 #: include/views/configuration.item.prototype.massupdate.php:214 #: include/views/js/configuration.discovery.edit.js.php:97 msgid "MD5" @@ -10167,7 +10191,7 @@ msgstr "Сумма MD5 файла. Возвращает символьную с #: include/audit.inc.php:52 #: include/views/administration.general.macros.edit.php:38 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/hostmacros.php:46 include/views/hostmacros.php:50 msgid "Macro" msgstr "Макрос" @@ -10264,7 +10288,7 @@ msgstr "Обслуживание удалено" msgid "Maintenance period" msgstr "Период обслуживания" -#: include/forms.inc.php:2112 +#: include/forms.inc.php:2360 msgid "Maintenance period length" msgstr "Длительность периода обслуживания" @@ -10411,7 +10435,7 @@ msgstr "Карты сетей" msgid "Mar" msgstr "Мрт." -#: include/forms.inc.php:1972 include/func.inc.php:118 +#: include/forms.inc.php:2220 include/func.inc.php:118 #: include/func.inc.php:255 jsLoader.php:135 msgid "March" msgstr "Март" @@ -10435,9 +10459,9 @@ msgstr "Маска" #: include/classes/screens/CScreenProblem.php:1095 #: include/views/configuration.host.list.php:360 #: include/views/configuration.item.list.php:291 -#: include/views/configuration.item.massupdate.php:691 +#: include/views/configuration.item.massupdate.php:575 #: include/views/configuration.item.prototype.list.php:176 -#: include/views/configuration.item.prototype.massupdate.php:686 +#: include/views/configuration.item.prototype.massupdate.php:586 #: include/views/configuration.trigger.prototype.list.php:164 #: include/views/configuration.trigger.prototype.massupdate.php:184 #: include/views/configuration.triggers.list.php:304 @@ -10453,14 +10477,14 @@ msgstr "Массовое обновление элементов" msgid "Mass update shapes" msgstr "Массовое обновление фигур" -#: disc_prototypes.php:51 include/views/configuration.item.edit.php:396 -#: include/views/configuration.item.massupdate.php:676 -#: include/views/configuration.item.prototype.edit.php:428 -#: include/views/configuration.item.prototype.massupdate.php:669 items.php:51 +#: disc_prototypes.php:51 include/views/configuration.item.edit.php:381 +#: include/views/configuration.item.massupdate.php:558 +#: include/views/configuration.item.prototype.edit.php:411 +#: include/views/configuration.item.prototype.massupdate.php:569 items.php:51 msgid "Master item" msgstr "Основной элемент данных" -#: include/items.inc.php:1766 +#: include/items.inc.php:1765 msgid "Matches regular expression" msgstr "" @@ -10511,7 +10535,7 @@ msgstr[2] "Максимальный период времени отображе msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Превышена максимальная длина email адреса у способа оповещения с ID \"%1$s\"." -#: include/forms.inc.php:1988 include/func.inc.php:120 +#: include/forms.inc.php:2236 include/func.inc.php:120 #: include/func.inc.php:257 jsLoader.php:137 msgid "May" msgstr "Май" @@ -10707,7 +10731,7 @@ msgstr[0] "Минимально отображаемым периодом явл msgstr[1] "Минимально отображаемым периодом является %1$s минуты." msgstr[2] "Минимально отображаемым периодом является %1$s минут." -#: include/forms.inc.php:2120 +#: include/forms.inc.php:2368 msgid "Minutes" msgstr "Минут" @@ -10720,7 +10744,7 @@ msgstr "Пропущенное поле \"gitemid\" для элемента да msgid "Missing \"itemid\" field for item." msgstr "Пропущенное поле \"itemid\" для элемента данных." -#: include/classes/api/services/CItemPrototype.php:312 +#: include/classes/api/services/CItemPrototype.php:327 #, c-format msgid "Missing \"name\" field for application prototype in item prototype \"%1$s\"." msgstr "Пропущенное поле \"имя\" у прототипа группы элементов данных в прототипе элементов данных \"%1$s\"." @@ -10770,7 +10794,7 @@ msgstr "Модель" msgid "Mon" msgstr "Пн" -#: include/forms.inc.php:1912 include/forms.inc.php:2027 +#: include/forms.inc.php:2160 include/forms.inc.php:2275 #: include/func.inc.php:135 include/func.inc.php:225 jsLoader.php:145 msgid "Monday" msgstr "Понедельник" @@ -10797,11 +10821,11 @@ msgstr "Мониторинг" msgid "Monospace" msgstr "Моноширинный" -#: app/views/report.services.php:67 include/forms.inc.php:1952 report4.php:166 +#: app/views/report.services.php:67 include/forms.inc.php:2200 report4.php:166 msgid "Month" msgstr "Месяц" -#: app/views/report.services.php:36 include/forms.inc.php:1877 +#: app/views/report.services.php:36 include/forms.inc.php:2125 #: include/maintenances.inc.php:37 report4.php:109 msgid "Monthly" msgstr "Ежемесячно" @@ -10848,9 +10872,9 @@ msgid "NNTP" msgstr "NNTP" #: include/httptest.inc.php:29 -#: include/views/configuration.host.discovery.edit.php:286 -#: include/views/configuration.item.edit.php:327 -#: include/views/configuration.item.prototype.edit.php:315 +#: include/views/configuration.host.discovery.edit.php:277 +#: include/views/configuration.item.edit.php:320 +#: include/views/configuration.item.prototype.edit.php:305 msgid "NTLM" msgstr "NTLM" @@ -10894,7 +10918,7 @@ msgstr "NTLM" #: disc_prototypes.php:42 graphs.php:42 host_discovery.php:48 httpconf.php:42 #: include/classes/screens/CScreenHttpTest.php:116 #: include/classes/widgets/CWidgetHelper.php:51 include/forms.inc.php:450 -#: include/hosts.inc.php:109 +#: include/forms.inc.php:1396 include/hosts.inc.php:109 #: include/views/administration.general.iconmap.edit.php:43 #: include/views/administration.general.iconmap.list.php:37 #: include/views/administration.general.image.edit.php:42 @@ -10922,9 +10946,9 @@ msgstr "NTLM" #: include/views/configuration.graph.edit.php:78 #: include/views/configuration.graph.edit.php:330 #: include/views/configuration.graph.list.php:87 -#: include/views/configuration.host.discovery.edit.php:46 -#: include/views/configuration.host.discovery.edit.php:110 -#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:44 +#: include/views/configuration.host.discovery.edit.php:109 +#: include/views/configuration.host.discovery.edit.php:201 #: include/views/configuration.host.discovery.list.php:51 #: include/views/configuration.host.edit.php:546 #: include/views/configuration.host.edit.php:623 @@ -10940,20 +10964,16 @@ msgstr "NTLM" #: include/views/configuration.httpconf.edit.php:195 #: include/views/configuration.httpconf.list.php:88 #: include/views/configuration.item.edit.php:63 -#: include/views/configuration.item.edit.php:142 -#: include/views/configuration.item.edit.php:237 -#: include/views/configuration.item.edit.php:935 +#: include/views/configuration.item.edit.php:144 +#: include/views/configuration.item.edit.php:236 #: include/views/configuration.item.list.php:63 #: include/views/configuration.item.list.php:150 -#: include/views/configuration.item.massupdate.php:154 -#: include/views/configuration.item.massupdate.php:341 -#: include/views/configuration.item.prototype.edit.php:51 -#: include/views/configuration.item.prototype.edit.php:130 -#: include/views/configuration.item.prototype.edit.php:225 -#: include/views/configuration.item.prototype.edit.php:768 +#: include/views/configuration.item.massupdate.php:152 +#: include/views/configuration.item.prototype.edit.php:49 +#: include/views/configuration.item.prototype.edit.php:129 +#: include/views/configuration.item.prototype.edit.php:221 #: include/views/configuration.item.prototype.list.php:52 #: include/views/configuration.item.prototype.massupdate.php:148 -#: include/views/configuration.item.prototype.massupdate.php:318 #: include/views/configuration.maintenance.edit.php:40 #: include/views/configuration.maintenance.list.php:45 #: include/views/configuration.maintenance.list.php:70 @@ -11053,12 +11073,12 @@ msgid "New" msgstr "Новый" #: include/views/configuration.httpconf.edit.php:75 -#: include/views/configuration.item.edit.php:876 -#: include/views/configuration.item.prototype.edit.php:725 +#: include/views/configuration.item.edit.php:861 +#: include/views/configuration.item.prototype.edit.php:714 msgid "New application" msgstr "Новая группа элементов данных" -#: include/views/configuration.item.prototype.edit.php:739 +#: include/views/configuration.item.prototype.edit.php:728 msgid "New application prototype" msgstr "Новый прототип группы элементов данных" @@ -11195,7 +11215,7 @@ msgstr "Не указан \"%1$s\" для шаблона комплексног msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"." msgstr "Не указано \"%2$s\" для условия фильтра действия \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1117 +#: include/classes/api/services/CDiscoveryRule.php:1281 #, c-format msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"." msgstr "Не указано \"%2$s\" для условия фильтра правила обнаружения \"%1$s\"." @@ -11205,7 +11225,7 @@ msgstr "Не указано \"%2$s\" для условия фильтра пра msgid "No \"%2$s\" given for the filter of action \"%1$s\"." msgstr "Не указан \"%2$s\" для фильтра в действии \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1085 +#: include/classes/api/services/CDiscoveryRule.php:1249 #, c-format msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"." msgstr "Не указано \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"." @@ -11308,7 +11328,7 @@ msgstr "Нет интерфейса по умолчанию для \"%1$s\" ти msgid "No details" msgstr "Без деталей" -#: include/classes/api/services/CDiscoveryRule.php:603 +#: include/classes/api/services/CDiscoveryRule.php:618 msgid "No discovery rule IDs given." msgstr "ID правил обнаружения не указаны." @@ -11349,7 +11369,7 @@ msgstr "Не найден прототип графика с таким ID дл msgid "No graphs added." msgstr "Графики не добавлены." -#: include/classes/api/services/CDiscoveryRule.php:606 +#: include/classes/api/services/CDiscoveryRule.php:621 msgid "No host IDs given." msgstr "Не указаны ID узлов сети." @@ -11386,10 +11406,10 @@ msgstr "Нет иконки для элемента карты сети \"%s\"." msgid "No image" msgstr "Нет изображения" -#: include/views/configuration.host.discovery.edit.php:382 -#: include/views/configuration.item.edit.php:474 -#: include/views/configuration.item.massupdate.php:78 -#: include/views/configuration.item.prototype.edit.php:461 +#: include/views/configuration.host.discovery.edit.php:368 +#: include/views/configuration.item.edit.php:459 +#: include/views/configuration.item.massupdate.php:77 +#: include/views/configuration.item.prototype.edit.php:444 #: include/views/configuration.item.prototype.massupdate.php:74 #: jsLoader.php:269 msgid "No interface found" @@ -11405,8 +11425,8 @@ msgstr "Интерфейс не найден." msgid "No interface provided for proxy \"%s\"." msgstr "Не указан интерфейс для прокси \"%s\"." -#: include/classes/api/services/CHost.php:1690 -#: include/classes/api/services/CHost.php:1866 +#: include/classes/api/services/CHost.php:1726 +#: include/classes/api/services/CHost.php:1902 #, c-format msgid "No interfaces for host \"%s\"." msgstr "Нет интерфейсов для узла сети \"%s\"." @@ -11469,8 +11489,8 @@ msgstr "Нет прав доступа в систему." #: app/controllers/CControllerWidgetDiscoveryView.php:64 #: app/controllers/CControllerWidgetMapView.php:68 #: app/controllers/CControllerWidgetPlainTextView.php:78 -#: app/views/monitoring.widget.graph.view.php:23 disc_prototypes.php:1171 -#: disc_prototypes.php:1385 include/classes/api/services/CAction.php:1541 +#: app/views/monitoring.widget.graph.view.php:23 disc_prototypes.php:1184 +#: disc_prototypes.php:1408 include/classes/api/services/CAction.php:1541 #: include/classes/api/services/CAction.php:1890 #: include/classes/api/services/CAction.php:2878 #: include/classes/api/services/CApplication.php:304 @@ -11485,9 +11505,10 @@ msgstr "Нет прав доступа в систему." #: include/classes/api/services/CDashboard.php:368 #: include/classes/api/services/CDashboard.php:393 #: include/classes/api/services/CDashboard.php:1233 -#: include/classes/api/services/CDiscoveryRule.php:481 -#: include/classes/api/services/CDiscoveryRule.php:582 -#: include/classes/api/services/CDiscoveryRule.php:618 +#: include/classes/api/services/CDiscoveryRule.php:496 +#: include/classes/api/services/CDiscoveryRule.php:597 +#: include/classes/api/services/CDiscoveryRule.php:633 +#: include/classes/api/services/CDiscoveryRule.php:1474 #: include/classes/api/services/CDRule.php:183 #: include/classes/api/services/CDRule.php:309 #: include/classes/api/services/CDRule.php:336 @@ -11504,21 +11525,21 @@ msgstr "Нет прав доступа в систему." #: include/classes/api/services/CGraphPrototype.php:717 #: include/classes/api/services/CHostBase.php:49 #: include/classes/api/services/CHostGeneral.php:56 -#: include/classes/api/services/CHostGroup.php:532 -#: include/classes/api/services/CHostGroup.php:788 -#: include/classes/api/services/CHostGroup.php:1027 -#: include/classes/api/services/CHostGroup.php:1058 -#: include/classes/api/services/CHostGroup.php:1159 -#: include/classes/api/services/CHostGroup.php:1281 -#: include/classes/api/services/CHostGroup.php:1301 +#: include/classes/api/services/CHostGroup.php:696 +#: include/classes/api/services/CHostGroup.php:805 +#: include/classes/api/services/CHostGroup.php:1044 +#: include/classes/api/services/CHostGroup.php:1075 +#: include/classes/api/services/CHostGroup.php:1176 +#: include/classes/api/services/CHostGroup.php:1298 +#: include/classes/api/services/CHostGroup.php:1318 #: include/classes/api/services/CHostInterface.php:239 #: include/classes/api/services/CHostInterface.php:259 #: include/classes/api/services/CHostInterface.php:394 #: include/classes/api/services/CHostInterface.php:653 #: include/classes/api/services/CHost.php:1122 #: include/classes/api/services/CHost.php:1157 -#: include/classes/api/services/CHost.php:1666 -#: include/classes/api/services/CHost.php:1798 +#: include/classes/api/services/CHost.php:1702 +#: include/classes/api/services/CHost.php:1834 #: include/classes/api/services/CHostPrototype.php:353 #: include/classes/api/services/CHostPrototype.php:399 #: include/classes/api/services/CHostPrototype.php:420 @@ -11538,8 +11559,8 @@ msgstr "Нет прав доступа в систему." #: include/classes/api/services/CItemGeneral.php:209 #: include/classes/api/services/CItemGeneral.php:311 #: include/classes/api/services/CItemGeneral.php:326 -#: include/classes/api/services/CItem.php:699 -#: include/classes/api/services/CItemPrototype.php:869 +#: include/classes/api/services/CItem.php:712 +#: include/classes/api/services/CItemPrototype.php:883 #: include/classes/api/services/CMaintenance.php:263 #: include/classes/api/services/CMaintenance.php:292 #: include/classes/api/services/CMaintenance.php:305 @@ -11598,7 +11619,7 @@ msgstr "Нет прав доступа в систему." #: include/classes/helpers/CMapHelper.php:83 #: include/classes/screens/CScreenHistory.php:139 #: include/classes/screens/CScreenHttpTestDetails.php:46 -#: include/func.inc.php:1758 items.php:1489 items.php:1673 +#: include/func.inc.php:1758 items.php:1490 items.php:1684 msgid "No permissions to referred object or it does not exist!" msgstr "Нет прав доступа к запрашиваемому объекту или он не существует!" @@ -11648,7 +11669,7 @@ msgstr "Не указан скрипт для команды в операции msgid "No target selected" msgstr "Цель не выбрана" -#: graphs.php:372 items.php:1354 +#: graphs.php:372 items.php:1355 msgid "No target selected." msgstr "Цель не выбрана." @@ -11661,7 +11682,7 @@ msgstr "Нет триггера с triggerid \"%1$s\"." msgid "No triggers defined." msgstr "Триггеры не заданы." -#: include/classes/validators/CApiInputValidator.php:618 +#: include/classes/validators/CApiInputValidator.php:622 msgid "Non-boolean flags are deprecated." msgstr "Не-логические флаги устарели." @@ -11682,17 +11703,17 @@ msgstr "Не-логические флаги устарели." #: include/views/administration.general.other.edit.php:42 #: include/views/administration.usergroups.edit.php:126 #: include/views/administration.usergroups.edit.php:158 -#: include/views/configuration.host.discovery.edit.php:284 +#: include/views/configuration.host.discovery.edit.php:275 #: include/views/configuration.host.list.php:275 #: include/views/configuration.host.list.php:281 #: include/views/configuration.host.list.php:293 #: include/views/configuration.host.list.php:296 -#: include/views/configuration.item.edit.php:325 -#: include/views/configuration.item.edit.php:881 -#: include/views/configuration.item.edit.php:895 -#: include/views/configuration.item.prototype.edit.php:313 -#: include/views/configuration.item.prototype.edit.php:732 -#: include/views/configuration.item.prototype.edit.php:747 +#: include/views/configuration.item.edit.php:318 +#: include/views/configuration.item.edit.php:866 +#: include/views/configuration.item.edit.php:880 +#: include/views/configuration.item.prototype.edit.php:303 +#: include/views/configuration.item.prototype.edit.php:721 +#: include/views/configuration.item.prototype.edit.php:736 #: include/views/configuration.trigger.prototype.edit.php:274 #: include/views/configuration.triggers.edit.php:298 #: include/views/js/monitoring.sysmaps.js.php:3 @@ -11786,7 +11807,7 @@ msgstr "Оповещать всех участников" msgid "Nov" msgstr "Нбр." -#: include/forms.inc.php:1991 include/func.inc.php:126 +#: include/forms.inc.php:2239 include/func.inc.php:126 #: include/func.inc.php:263 jsLoader.php:143 msgid "November" msgstr "Ноябрь" @@ -11928,14 +11949,15 @@ msgstr "Количество виртуальных машин на VMware ги msgid "Number or percentage of inodes. Returns integer for number; float for percentage" msgstr "Количество inode в процентах. Возвращает целое число для количества; дробное - для процентов" -#: include/items.inc.php:1755 +#: include/items.inc.php:1748 include/items.inc.php:1752 +#: include/items.inc.php:1756 msgid "Numeral systems" msgstr "Системы счисления" #: include/forms.inc.php:352 include/items.inc.php:129 -#: include/triggers.inc.php:1862 include/views/configuration.item.edit.php:677 -#: include/views/configuration.item.massupdate.php:278 -#: include/views/configuration.item.prototype.edit.php:606 +#: include/triggers.inc.php:1862 include/views/configuration.item.edit.php:664 +#: include/views/configuration.item.massupdate.php:266 +#: include/views/configuration.item.prototype.edit.php:593 #: include/views/configuration.item.prototype.massupdate.php:261 msgid "Numeric (float)" msgstr "Числовой (с плавающей точкой)" @@ -11945,9 +11967,9 @@ msgid "Numeric (integer)" msgstr "Числовой (целочисленный)" #: include/forms.inc.php:351 include/items.inc.php:127 -#: include/views/configuration.item.edit.php:676 -#: include/views/configuration.item.massupdate.php:277 -#: include/views/configuration.item.prototype.edit.php:605 +#: include/views/configuration.item.edit.php:663 +#: include/views/configuration.item.massupdate.php:265 +#: include/views/configuration.item.prototype.edit.php:592 #: include/views/configuration.item.prototype.massupdate.php:260 msgid "Numeric (unsigned)" msgstr "Числовой (целое положительное)" @@ -12009,11 +12031,11 @@ msgstr "ОС (Короткое описание)" msgid "Oct" msgstr "Окт" -#: include/items.inc.php:1758 +#: include/items.inc.php:1753 msgid "Octal to decimal" msgstr "Восьмеричное в десятичное" -#: include/forms.inc.php:1983 include/func.inc.php:125 +#: include/forms.inc.php:2231 include/func.inc.php:125 #: include/func.inc.php:262 jsLoader.php:142 msgid "October" msgstr "Октябрь" @@ -12030,7 +12052,7 @@ msgstr "Выкл" #: include/classes/html/CTriggersInfo.php:76 #: include/views/administration.users.list.php:124 #: include/views/configuration.triggers.list.php:58 -#: include/views/js/common.item.edit.js.php:736 +#: include/views/js/common.item.edit.js.php:327 #: include/views/js/configuration.httpconf.edit.js.php:584 #: include/views/js/configuration.httpconf.edit.js.php:658 #: include/views/js/conf.import.js.php:24 report2.php:431 @@ -12065,11 +12087,11 @@ msgstr "Один раз" msgid "One" msgstr "Одна" -#: include/classes/api/services/CHostGroup.php:1169 +#: include/classes/api/services/CHostGroup.php:1186 msgid "One of the objects is left without a host group." msgstr "Один из объектов остался без группы узлов сети." -#: include/forms.inc.php:1874 include/maintenances.inc.php:31 +#: include/forms.inc.php:2122 include/maintenances.inc.php:31 msgid "One time only" msgstr "Единовременно" @@ -12078,7 +12100,7 @@ msgstr "Единовременно" msgid "One-time downtime" msgstr "Однократная недоступность" -#: include/classes/api/services/CHostGroup.php:743 +#: include/classes/api/services/CHostGroup.php:655 msgid "Only Super Admins can create host groups." msgstr "Только Супер Администраторы могут создавать группы узлов сети." @@ -12128,7 +12150,7 @@ msgstr "Только администраторы могут указывать msgid "Only items assigned to enabled hosts are counted" msgstr "Подсчитываются только элементы данных у активированных узлов сети" -#: include/classes/api/services/CItemGeneral.php:1369 +#: include/classes/api/services/CItemGeneral.php:1459 msgid "Only one change step is allowed." msgstr "Разрешен только один шаг изменения." @@ -12136,8 +12158,8 @@ msgstr "Разрешен только один шаг изменения." msgid "Only one check can be unique." msgstr "Только одна проверка может быть уникальной." -#: include/classes/api/services/CItemGeneral.php:1346 -#: include/classes/api/services/CItemGeneral.php:1391 +#: include/classes/api/services/CItemGeneral.php:1436 +#: include/classes/api/services/CItemGeneral.php:1481 msgid "Only one throttling step is allowed." msgstr "" @@ -12252,7 +12274,7 @@ msgstr "Опции" #: include/views/configuration.action.edit.php:113 #: include/views/configuration.action.edit.php:1151 #: include/views/configuration.correlation.edit.php:95 -#: include/views/configuration.host.discovery.edit.php:599 +#: include/views/configuration.host.discovery.edit.php:587 #: include/views/configuration.maintenance.edit.php:171 #: include/views/configuration.trigger.prototype.edit.php:137 #: include/views/configuration.trigger.prototype.edit.php:329 @@ -12276,41 +12298,41 @@ msgstr "Или" #: include/views/configuration.host.massupdate.php:268 #: include/views/configuration.host.massupdate.php:309 #: include/views/configuration.host.massupdate.php:348 -#: include/views/configuration.item.massupdate.php:41 -#: include/views/configuration.item.massupdate.php:84 +#: include/views/configuration.item.massupdate.php:40 +#: include/views/configuration.item.massupdate.php:83 #: include/views/configuration.item.massupdate.php:96 -#: include/views/configuration.item.massupdate.php:104 -#: include/views/configuration.item.massupdate.php:113 -#: include/views/configuration.item.massupdate.php:127 -#: include/views/configuration.item.massupdate.php:148 -#: include/views/configuration.item.massupdate.php:184 -#: include/views/configuration.item.massupdate.php:192 -#: include/views/configuration.item.massupdate.php:200 -#: include/views/configuration.item.massupdate.php:208 -#: include/views/configuration.item.massupdate.php:220 +#: include/views/configuration.item.massupdate.php:103 +#: include/views/configuration.item.massupdate.php:111 +#: include/views/configuration.item.massupdate.php:124 +#: include/views/configuration.item.massupdate.php:146 +#: include/views/configuration.item.massupdate.php:181 +#: include/views/configuration.item.massupdate.php:188 +#: include/views/configuration.item.massupdate.php:195 +#: include/views/configuration.item.massupdate.php:202 +#: include/views/configuration.item.massupdate.php:213 +#: include/views/configuration.item.massupdate.php:225 #: include/views/configuration.item.massupdate.php:233 -#: include/views/configuration.item.massupdate.php:242 -#: include/views/configuration.item.massupdate.php:256 -#: include/views/configuration.item.massupdate.php:265 -#: include/views/configuration.item.massupdate.php:273 -#: include/views/configuration.item.massupdate.php:287 -#: include/views/configuration.item.massupdate.php:295 -#: include/views/configuration.item.massupdate.php:306 -#: include/views/configuration.item.massupdate.php:314 -#: include/views/configuration.item.massupdate.php:322 -#: include/views/configuration.item.massupdate.php:330 -#: include/views/configuration.item.massupdate.php:437 -#: include/views/configuration.item.massupdate.php:509 +#: include/views/configuration.item.massupdate.php:246 +#: include/views/configuration.item.massupdate.php:254 +#: include/views/configuration.item.massupdate.php:261 +#: include/views/configuration.item.massupdate.php:274 +#: include/views/configuration.item.massupdate.php:281 +#: include/views/configuration.item.massupdate.php:291 +#: include/views/configuration.item.massupdate.php:298 +#: include/views/configuration.item.massupdate.php:305 +#: include/views/configuration.item.massupdate.php:312 +#: include/views/configuration.item.massupdate.php:319 +#: include/views/configuration.item.massupdate.php:392 +#: include/views/configuration.item.massupdate.php:399 +#: include/views/configuration.item.massupdate.php:406 +#: include/views/configuration.item.massupdate.php:419 +#: include/views/configuration.item.massupdate.php:426 +#: include/views/configuration.item.massupdate.php:441 +#: include/views/configuration.item.massupdate.php:449 +#: include/views/configuration.item.massupdate.php:456 #: include/views/configuration.item.massupdate.php:517 -#: include/views/configuration.item.massupdate.php:523 -#: include/views/configuration.item.massupdate.php:535 -#: include/views/configuration.item.massupdate.php:543 -#: include/views/configuration.item.massupdate.php:560 -#: include/views/configuration.item.massupdate.php:567 -#: include/views/configuration.item.massupdate.php:574 -#: include/views/configuration.item.massupdate.php:635 -#: include/views/configuration.item.massupdate.php:675 -#: include/views/configuration.item.massupdate.php:684 +#: include/views/configuration.item.massupdate.php:557 +#: include/views/configuration.item.massupdate.php:566 #: include/views/configuration.item.prototype.massupdate.php:36 #: include/views/configuration.item.prototype.massupdate.php:79 #: include/views/configuration.item.prototype.massupdate.php:92 @@ -12334,19 +12356,19 @@ msgstr "Или" #: include/views/configuration.item.prototype.massupdate.php:293 #: include/views/configuration.item.prototype.massupdate.php:300 #: include/views/configuration.item.prototype.massupdate.php:307 -#: include/views/configuration.item.prototype.massupdate.php:414 -#: include/views/configuration.item.prototype.massupdate.php:488 -#: include/views/configuration.item.prototype.massupdate.php:495 -#: include/views/configuration.item.prototype.massupdate.php:502 -#: include/views/configuration.item.prototype.massupdate.php:517 -#: include/views/configuration.item.prototype.massupdate.php:524 -#: include/views/configuration.item.prototype.massupdate.php:540 -#: include/views/configuration.item.prototype.massupdate.php:548 -#: include/views/configuration.item.prototype.massupdate.php:555 -#: include/views/configuration.item.prototype.massupdate.php:561 -#: include/views/configuration.item.prototype.massupdate.php:636 -#: include/views/configuration.item.prototype.massupdate.php:668 -#: include/views/configuration.item.prototype.massupdate.php:678 +#: include/views/configuration.item.prototype.massupdate.php:314 +#: include/views/configuration.item.prototype.massupdate.php:388 +#: include/views/configuration.item.prototype.massupdate.php:395 +#: include/views/configuration.item.prototype.massupdate.php:402 +#: include/views/configuration.item.prototype.massupdate.php:417 +#: include/views/configuration.item.prototype.massupdate.php:424 +#: include/views/configuration.item.prototype.massupdate.php:440 +#: include/views/configuration.item.prototype.massupdate.php:448 +#: include/views/configuration.item.prototype.massupdate.php:455 +#: include/views/configuration.item.prototype.massupdate.php:461 +#: include/views/configuration.item.prototype.massupdate.php:536 +#: include/views/configuration.item.prototype.massupdate.php:568 +#: include/views/configuration.item.prototype.massupdate.php:578 #: include/views/configuration.trigger.prototype.massupdate.php:41 #: include/views/configuration.trigger.prototype.massupdate.php:131 #: include/views/configuration.trigger.prototype.massupdate.php:163 @@ -12380,8 +12402,8 @@ msgstr "Другие" msgid "Outgoing traffic statistics on network interface. Returns integer" msgstr "Статистика исходящего трафика на сетевом интерфейсе. Возвращает число" -#: include/views/configuration.item.edit.php:769 -#: include/views/configuration.item.edit.php:795 +#: include/views/configuration.item.edit.php:756 +#: include/views/configuration.item.edit.php:782 msgctxt "item_form" msgid "Overridden by" msgstr "Переопределено" @@ -12630,20 +12652,16 @@ msgstr "Страница получила некорректные данные" msgid "Parameter" msgstr "Параметр" -#: include/classes/validators/CApiInputValidator.php:678 +#: include/classes/validators/CApiInputValidator.php:682 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Параметр \"%1$s\" устарел." -#: include/classes/debug/CProfiler.php:182 -#: include/views/configuration.item.edit.php:936 -#: include/views/configuration.item.massupdate.php:342 -#: include/views/configuration.item.prototype.edit.php:769 -#: include/views/configuration.item.prototype.massupdate.php:319 +#: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1397 msgid "Parameters" msgstr "Параметры" -#: include/views/configuration.host.discovery.edit.php:42 +#: include/views/configuration.host.discovery.edit.php:40 #: include/views/configuration.host.prototype.edit.php:52 msgid "Parent discovery rules" msgstr "Родительские правила обнаружения" @@ -12653,7 +12671,7 @@ msgid "Parent graphs" msgstr "Родительские графики" #: include/views/configuration.item.edit.php:44 -#: include/views/configuration.item.prototype.edit.php:42 +#: include/views/configuration.item.prototype.edit.php:40 msgid "Parent items" msgstr "Родительские элементы данных" @@ -12671,9 +12689,9 @@ msgid "Parent web scenarios" msgstr "Родительские веб-сценарии" #: app/views/popup.httpstep.php:56 -#: include/views/configuration.host.discovery.edit.php:82 -#: include/views/configuration.item.edit.php:114 -#: include/views/configuration.item.prototype.edit.php:103 +#: include/views/configuration.host.discovery.edit.php:80 +#: include/views/configuration.item.edit.php:115 +#: include/views/configuration.item.prototype.edit.php:101 msgid "Parse" msgstr "Анализ" @@ -12693,7 +12711,7 @@ msgid "Passive" msgstr "Пассивный" #: app/views/administration.mediatype.edit.php:164 disc_prototypes.php:266 -#: host_discovery.php:207 httpconf.php:58 +#: host_discovery.php:208 httpconf.php:58 #: include/classes/setup/CSetupWizard.php:248 #: include/views/administration.users.edit.php:109 #: include/views/administration.users.edit.php:140 @@ -12703,24 +12721,24 @@ msgstr "Пассивный" #: include/views/configuration.action.edit.php:1762 #: include/views/configuration.action.edit.php:2197 #: include/views/configuration.action.edit.php:2224 -#: include/views/configuration.host.discovery.edit.php:303 -#: include/views/configuration.host.discovery.edit.php:461 -#: include/views/configuration.host.discovery.edit.php:489 +#: include/views/configuration.host.discovery.edit.php:292 +#: include/views/configuration.host.discovery.edit.php:449 +#: include/views/configuration.host.discovery.edit.php:478 #: include/views/configuration.host.edit.php:670 #: include/views/configuration.host.prototype.edit.php:338 #: include/views/configuration.httpconf.edit.php:164 -#: include/views/configuration.item.edit.php:344 -#: include/views/configuration.item.edit.php:600 -#: include/views/configuration.item.edit.php:636 -#: include/views/configuration.item.massupdate.php:299 -#: include/views/configuration.item.massupdate.php:331 -#: include/views/configuration.item.prototype.edit.php:332 -#: include/views/configuration.item.prototype.edit.php:540 -#: include/views/configuration.item.prototype.edit.php:568 +#: include/views/configuration.item.edit.php:335 +#: include/views/configuration.item.edit.php:586 +#: include/views/configuration.item.edit.php:623 +#: include/views/configuration.item.massupdate.php:285 +#: include/views/configuration.item.massupdate.php:313 +#: include/views/configuration.item.prototype.edit.php:320 +#: include/views/configuration.item.prototype.edit.php:526 +#: include/views/configuration.item.prototype.edit.php:555 #: include/views/configuration.item.prototype.massupdate.php:280 #: include/views/configuration.item.prototype.massupdate.php:308 #: include/views/general.login.php:64 -#: include/views/js/common.item.edit.js.php:521 items.php:263 +#: include/views/js/common.item.edit.js.php:251 items.php:263 msgid "Password" msgstr "Пароль" @@ -12771,17 +12789,17 @@ msgid "Performs a DNS query. Returns character string with the required type of msgstr "Выполнение DNS запроса. Возвращает строку символов с требуемым типом информации" #: app/views/report.services.php:31 -#: include/views/configuration.host.discovery.edit.php:518 -#: include/views/configuration.item.edit.php:700 -#: include/views/configuration.item.massupdate.php:457 -#: include/views/configuration.item.prototype.edit.php:629 -#: include/views/configuration.item.prototype.massupdate.php:435 +#: include/views/configuration.host.discovery.edit.php:506 +#: include/views/configuration.item.edit.php:687 +#: include/views/configuration.item.massupdate.php:339 +#: include/views/configuration.item.prototype.edit.php:616 +#: include/views/configuration.item.prototype.massupdate.php:335 #: include/views/configuration.maintenance.edit.php:77 report4.php:104 #: srv_status.php:170 msgid "Period" msgstr "Период" -#: include/forms.inc.php:1872 +#: include/forms.inc.php:2120 #: include/views/configuration.maintenance.edit.php:77 #: include/views/configuration.services.edit.php:226 msgid "Period type" @@ -12888,24 +12906,24 @@ msgstr "Точки" msgid "Polish (pl_PL)" msgstr "Польский (pl_PL)" -#: include/views/configuration.item.edit.php:915 +#: include/views/configuration.item.edit.php:900 msgid "Populates host inventory field" msgstr "Заполнение поля инвентаря узла сети" -#: app/views/administration.authentication.edit.php:88 +#: app/views/administration.authentication.edit.php:92 #: app/views/administration.proxy.edit.php:43 disc_prototypes.php:121 #: host_discovery.php:105 include/classes/setup/CSetupWizard.php:279 #: include/forms.inc.php:472 include/views/configuration.action.edit.php:995 #: include/views/configuration.action.edit.php:1777 #: include/views/configuration.action.edit.php:2236 -#: include/views/configuration.host.discovery.edit.php:448 +#: include/views/configuration.host.discovery.edit.php:436 #: include/views/configuration.host.edit.php:111 #: include/views/configuration.host.edit.php:194 #: include/views/configuration.host.list.php:113 #: include/views/configuration.host.prototype.edit.php:86 -#: include/views/configuration.item.edit.php:586 -#: include/views/configuration.item.massupdate.php:266 -#: include/views/configuration.item.prototype.edit.php:527 +#: include/views/configuration.item.edit.php:572 +#: include/views/configuration.item.massupdate.php:255 +#: include/views/configuration.item.prototype.edit.php:513 #: include/views/configuration.item.prototype.massupdate.php:250 #: include/views/inventory.host.view.php:72 items.php:131 items.php:304 #: setup.php:50 @@ -12945,15 +12963,17 @@ msgstr "Тип Post" msgid "Pre-installation summary" msgstr "Предварительный обзор инсталляции" -#: include/views/configuration.item.edit.php:1161 -#: include/views/configuration.item.prototype.edit.php:994 +#: include/views/configuration.host.discovery.edit.php:742 +#: include/views/configuration.item.edit.php:918 +#: include/views/configuration.item.prototype.edit.php:754 msgid "Preprocessing" msgstr "Предобработка" -#: include/views/configuration.item.edit.php:1156 -#: include/views/configuration.item.massupdate.php:438 -#: include/views/configuration.item.prototype.edit.php:989 -#: include/views/configuration.item.prototype.massupdate.php:415 +#: include/views/configuration.host.discovery.edit.php:744 +#: include/views/configuration.item.edit.php:920 +#: include/views/configuration.item.massupdate.php:320 +#: include/views/configuration.item.prototype.edit.php:756 +#: include/views/configuration.item.prototype.massupdate.php:315 msgid "Preprocessing steps" msgstr "Шаги предобработки" @@ -13004,19 +13024,19 @@ msgstr "Первичный телефон B для контакта" msgid "Primary POC screen name" msgstr "Первичное ник-имя для контакта" -#: include/views/configuration.host.discovery.edit.php:443 -#: include/views/configuration.item.edit.php:581 -#: include/views/configuration.item.massupdate.php:257 -#: include/views/configuration.item.prototype.edit.php:522 +#: include/views/configuration.host.discovery.edit.php:431 +#: include/views/configuration.item.edit.php:567 +#: include/views/configuration.item.massupdate.php:247 +#: include/views/configuration.item.prototype.edit.php:508 #: include/views/configuration.item.prototype.massupdate.php:242 #: include/views/js/configuration.discovery.edit.js.php:118 msgid "Privacy passphrase" msgstr "Ключевая фраза безопасности" -#: include/views/configuration.host.discovery.edit.php:436 -#: include/views/configuration.item.edit.php:575 -#: include/views/configuration.item.massupdate.php:243 -#: include/views/configuration.item.prototype.edit.php:515 +#: include/views/configuration.host.discovery.edit.php:424 +#: include/views/configuration.item.edit.php:562 +#: include/views/configuration.item.massupdate.php:234 +#: include/views/configuration.item.prototype.edit.php:501 #: include/views/configuration.item.prototype.massupdate.php:230 #: include/views/js/configuration.discovery.edit.js.php:110 msgid "Privacy protocol" @@ -13032,10 +13052,10 @@ msgstr "Приватный" #: include/views/configuration.action.edit.php:974 #: include/views/configuration.action.edit.php:1754 #: include/views/configuration.action.edit.php:2217 -#: include/views/configuration.host.discovery.edit.php:483 -#: include/views/configuration.item.edit.php:630 -#: include/views/configuration.item.massupdate.php:323 -#: include/views/configuration.item.prototype.edit.php:562 +#: include/views/configuration.host.discovery.edit.php:472 +#: include/views/configuration.item.edit.php:617 +#: include/views/configuration.item.massupdate.php:306 +#: include/views/configuration.item.prototype.edit.php:549 #: include/views/configuration.item.prototype.massupdate.php:301 msgid "Private key file" msgstr "Файл приватного ключа" @@ -13234,10 +13254,10 @@ msgstr "Публичный" #: include/views/configuration.action.edit.php:953 #: include/views/configuration.action.edit.php:1731 #: include/views/configuration.action.edit.php:2198 -#: include/views/configuration.host.discovery.edit.php:462 -#: include/views/configuration.item.edit.php:601 -#: include/views/configuration.item.massupdate.php:300 -#: include/views/configuration.item.prototype.edit.php:541 +#: include/views/configuration.host.discovery.edit.php:450 +#: include/views/configuration.item.edit.php:587 +#: include/views/configuration.item.massupdate.php:286 +#: include/views/configuration.item.prototype.edit.php:527 #: include/views/configuration.item.prototype.massupdate.php:281 msgid "Public key" msgstr "Публичный ключ" @@ -13245,18 +13265,18 @@ msgstr "Публичный ключ" #: include/views/configuration.action.edit.php:966 #: include/views/configuration.action.edit.php:1745 #: include/views/configuration.action.edit.php:2209 -#: include/views/configuration.host.discovery.edit.php:476 -#: include/views/configuration.item.edit.php:623 -#: include/views/configuration.item.massupdate.php:315 -#: include/views/configuration.item.prototype.edit.php:555 +#: include/views/configuration.host.discovery.edit.php:465 +#: include/views/configuration.item.edit.php:610 +#: include/views/configuration.item.massupdate.php:299 +#: include/views/configuration.item.prototype.edit.php:542 #: include/views/configuration.item.prototype.massupdate.php:294 msgid "Public key file" msgstr "Файл публичного ключа" #: app/views/popup.httpstep.php:65 -#: include/views/configuration.host.discovery.edit.php:106 -#: include/views/configuration.item.edit.php:138 -#: include/views/configuration.item.prototype.edit.php:126 +#: include/views/configuration.host.discovery.edit.php:105 +#: include/views/configuration.item.edit.php:140 +#: include/views/configuration.item.prototype.edit.php:125 msgid "Query fields" msgstr "Поля запроса" @@ -13282,10 +13302,10 @@ msgid "RMCP+" msgstr "RMCP+" #: app/views/popup.httpstep.php:76 -#: include/views/configuration.host.discovery.edit.php:171 -#: include/views/configuration.item.edit.php:203 -#: include/views/configuration.item.massupdate.php:118 -#: include/views/configuration.item.prototype.edit.php:191 +#: include/views/configuration.host.discovery.edit.php:167 +#: include/views/configuration.item.edit.php:202 +#: include/views/configuration.item.massupdate.php:116 +#: include/views/configuration.item.prototype.edit.php:187 #: include/views/configuration.item.prototype.massupdate.php:112 msgid "Raw data" msgstr "Сырые данные" @@ -13379,8 +13399,8 @@ msgstr "Восстановление" msgid "Recovery expression" msgstr "Выражение восстановления" -#: include/forms.inc.php:1690 include/forms.inc.php:1695 -#: include/forms.inc.php:1703 +#: include/forms.inc.php:1938 include/forms.inc.php:1943 +#: include/forms.inc.php:1951 msgid "Recovery expression syntax error." msgstr "Синтаксическая ошибка в выражении восстановления." @@ -13428,8 +13448,8 @@ msgstr "Обновление неподдерживаемых элементов msgid "Regular" msgstr "Обычные" -#: include/audit.inc.php:49 include/items.inc.php:1728 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/audit.inc.php:49 include/items.inc.php:1713 +#: include/views/configuration.host.discovery.edit.php:605 msgid "Regular expression" msgstr "Регулярное выражение" @@ -13492,7 +13512,7 @@ msgstr "Удаленная команда" #: app/views/popup.triggerwizard.js.php:335 #: app/views/popup.triggerwizard.php:57 app/views/popup.triggerwizard.php:101 #: include/classes/widgets/CWidgetHelper.php:408 -#: include/classes/widgets/CWidgetHelper.php:452 +#: include/classes/widgets/CWidgetHelper.php:452 include/forms.inc.php:1593 #: include/views/administration.general.iconmap.edit.php:84 #: include/views/administration.general.macros.edit.php:56 #: include/views/administration.general.regularexpressions.edit.php:77 @@ -13508,28 +13528,25 @@ msgstr "Удаленная команда" #: include/views/configuration.action.edit.php:1916 #: include/views/configuration.correlation.edit.php:76 #: include/views/configuration.correlation.edit.php:230 -#: include/views/configuration.host.discovery.edit.php:131 -#: include/views/configuration.host.discovery.edit.php:226 -#: include/views/configuration.host.discovery.edit.php:547 -#: include/views/configuration.host.discovery.edit.php:660 +#: include/views/configuration.host.discovery.edit.php:130 +#: include/views/configuration.host.discovery.edit.php:222 +#: include/views/configuration.host.discovery.edit.php:535 +#: include/views/configuration.host.discovery.edit.php:648 +#: include/views/configuration.host.discovery.edit.php:717 #: include/views/configuration.httpconf.edit.php:243 -#: include/views/configuration.item.edit.php:163 -#: include/views/configuration.item.edit.php:258 -#: include/views/configuration.item.edit.php:741 -#: include/views/configuration.item.edit.php:1129 -#: include/views/configuration.item.massupdate.php:170 -#: include/views/configuration.item.massupdate.php:421 -#: include/views/configuration.item.massupdate.php:489 -#: include/views/configuration.item.massupdate.php:612 -#: include/views/configuration.item.prototype.edit.php:151 -#: include/views/configuration.item.prototype.edit.php:246 -#: include/views/configuration.item.prototype.edit.php:658 -#: include/views/configuration.item.prototype.edit.php:962 +#: include/views/configuration.item.edit.php:165 +#: include/views/configuration.item.edit.php:257 +#: include/views/configuration.item.edit.php:728 +#: include/views/configuration.item.massupdate.php:168 +#: include/views/configuration.item.massupdate.php:371 +#: include/views/configuration.item.massupdate.php:494 +#: include/views/configuration.item.prototype.edit.php:150 +#: include/views/configuration.item.prototype.edit.php:242 +#: include/views/configuration.item.prototype.edit.php:645 #: include/views/configuration.item.prototype.massupdate.php:164 -#: include/views/configuration.item.prototype.massupdate.php:398 -#: include/views/configuration.item.prototype.massupdate.php:467 -#: include/views/configuration.item.prototype.massupdate.php:568 -#: include/views/configuration.item.prototype.massupdate.php:643 +#: include/views/configuration.item.prototype.massupdate.php:367 +#: include/views/configuration.item.prototype.massupdate.php:468 +#: include/views/configuration.item.prototype.massupdate.php:543 #: include/views/configuration.maintenance.edit.php:95 #: include/views/configuration.maintenance.edit.php:193 #: include/views/configuration.maintenance.edit.php:213 @@ -13556,24 +13573,24 @@ msgstr "Удаленная команда" #: include/views/js/adm.regexprs.edit.js.php:12 #: include/views/js/common.filter.trigger.js.php:14 #: include/views/js/common.item.edit.js.php:22 -#: include/views/js/common.item.edit.js.php:64 #: include/views/js/configuration.action.edit.js.php:9 #: include/views/js/configuration.action.edit.js.php:21 #: include/views/js/configuration.action.edit.js.php:35 #: include/views/js/configuration.action.edit.js.php:49 #: include/views/js/configuration.discovery.edit.js.php:10 #: include/views/js/configuration.graph.edit.js.php:93 -#: include/views/js/configuration.host.discovery.edit.js.php:31 +#: include/views/js/configuration.host.discovery.edit.js.php:33 +#: include/views/js/configuration.host.discovery.edit.js.php:53 #: include/views/js/configuration.host.edit.js.php:47 #: include/views/js/configuration.host.prototype.edit.js.php:7 #: include/views/js/configuration.httpconf.edit.js.php:21 -#: include/views/js/configuration.item.massupdate.js.php:22 -#: include/views/js/configuration.item.massupdate.js.php:47 +#: include/views/js/configuration.item.massupdate.js.php:26 #: include/views/js/configuration.maintenance.edit.js.php:14 #: include/views/js/configuration.services.edit.js.php:81 #: include/views/js/configuration.triggers.edit.js.php:11 #: include/views/js/configuration.triggers.list.js.php:14 #: include/views/js/hostmacros.js.php:14 include/views/js/hostmacros.js.php:46 +#: include/views/js/item.preprocessing.js.php:32 #: include/views/js/monitoring.screen.edit.js.php:24 #: include/views/js/monitoring.screen.edit.js.php:58 #: include/views/js/monitoring.slideconf.edit.js.php:16 @@ -13599,7 +13616,7 @@ msgstr "Удаленная команда" msgid "Remove" msgstr "Удалить" -#: app/views/administration.authentication.edit.php:47 +#: app/views/administration.authentication.edit.php:48 msgid "Remove domain name" msgstr "Удаление имени домена" @@ -13638,9 +13655,9 @@ msgid "Removed, %1$s" msgstr "Удалено, %1$s" #: include/views/configuration.host.massupdate.php:214 -#: include/views/configuration.item.massupdate.php:611 -#: include/views/configuration.item.prototype.massupdate.php:567 -#: include/views/configuration.item.prototype.massupdate.php:642 +#: include/views/configuration.item.massupdate.php:493 +#: include/views/configuration.item.prototype.massupdate.php:467 +#: include/views/configuration.item.prototype.massupdate.php:542 #: include/views/configuration.trigger.prototype.edit.php:144 #: include/views/configuration.trigger.prototype.edit.php:336 #: include/views/configuration.triggers.edit.php:165 @@ -13666,29 +13683,29 @@ msgstr "Заменить теги" msgid "Reports" msgstr "Отчеты" -#: include/views/configuration.host.discovery.edit.php:181 -#: include/views/configuration.item.edit.php:213 -#: include/views/configuration.item.massupdate.php:128 -#: include/views/configuration.item.prototype.edit.php:201 +#: include/views/configuration.host.discovery.edit.php:176 +#: include/views/configuration.item.edit.php:211 +#: include/views/configuration.item.massupdate.php:125 +#: include/views/configuration.item.prototype.edit.php:196 #: include/views/configuration.item.prototype.massupdate.php:121 msgid "Request body" msgstr "Запрос тела" -#: include/views/configuration.host.discovery.edit.php:169 -#: include/views/configuration.item.edit.php:201 -#: include/views/configuration.item.massupdate.php:114 -#: include/views/configuration.item.prototype.edit.php:189 +#: include/views/configuration.host.discovery.edit.php:165 +#: include/views/configuration.item.edit.php:200 +#: include/views/configuration.item.massupdate.php:112 +#: include/views/configuration.item.prototype.edit.php:185 #: include/views/configuration.item.prototype.massupdate.php:108 msgid "Request body type" msgstr "Типа запроса тела" -#: host_discovery.php:284 host_discovery.php:529 items.php:967 items.php:1416 +#: host_discovery.php:288 host_discovery.php:608 items.php:967 items.php:1417 msgid "Request sent successfully" msgstr "Запрос успешно отправлен" -#: include/views/configuration.host.discovery.edit.php:147 -#: include/views/configuration.item.edit.php:179 -#: include/views/configuration.item.prototype.edit.php:167 +#: include/views/configuration.host.discovery.edit.php:145 +#: include/views/configuration.item.edit.php:180 +#: include/views/configuration.item.prototype.edit.php:165 msgid "Request type" msgstr "Тип запроса" @@ -13714,9 +13731,9 @@ msgid "Required server performance, new values per second" msgstr "Требуемое быстродействие сервера, новые значения в секунду" #: app/views/popup.httpstep.php:155 -#: include/views/configuration.host.discovery.edit.php:242 -#: include/views/configuration.item.edit.php:274 -#: include/views/configuration.item.prototype.edit.php:262 +#: include/views/configuration.host.discovery.edit.php:237 +#: include/views/configuration.item.edit.php:272 +#: include/views/configuration.item.prototype.edit.php:257 msgid "Required status codes" msgstr "Требуемые коды состояния" @@ -13820,9 +13837,9 @@ msgid "Result type" msgstr "Тип результата" #: app/views/popup.httpstep.php:140 -#: include/views/configuration.host.discovery.edit.php:259 -#: include/views/configuration.item.edit.php:291 -#: include/views/configuration.item.prototype.edit.php:279 +#: include/views/configuration.host.discovery.edit.php:252 +#: include/views/configuration.item.edit.php:287 +#: include/views/configuration.item.prototype.edit.php:272 msgid "Retrieve mode" msgstr "Режим получения" @@ -13887,7 +13904,7 @@ msgstr "По правой стороне" msgid "Right Y" msgstr "Ось Y справа" -#: include/items.inc.php:1730 +#: include/items.inc.php:1721 msgid "Right trim" msgstr "Обрезать справа" @@ -13976,11 +13993,11 @@ msgctxt "Sunday short" msgid "S" msgstr "Вс" -#: include/views/configuration.host.discovery.edit.php:427 -#: include/views/configuration.item.edit.php:537 -#: include/views/configuration.item.edit.php:544 -#: include/views/configuration.item.massupdate.php:226 -#: include/views/configuration.item.prototype.edit.php:506 +#: include/views/configuration.host.discovery.edit.php:415 +#: include/views/configuration.item.edit.php:523 +#: include/views/configuration.item.edit.php:530 +#: include/views/configuration.item.massupdate.php:219 +#: include/views/configuration.item.prototype.edit.php:492 #: include/views/configuration.item.prototype.massupdate.php:215 #: include/views/js/configuration.discovery.edit.js.php:98 msgid "SHA" @@ -14025,18 +14042,18 @@ msgid "SNMP" msgstr "SNMP" #: disc_prototypes.php:114 host_discovery.php:100 include/forms.inc.php:453 -#: include/views/configuration.host.discovery.edit.php:393 -#: include/views/configuration.item.edit.php:488 -#: include/views/configuration.item.prototype.edit.php:472 +#: include/views/configuration.host.discovery.edit.php:378 +#: include/views/configuration.item.edit.php:474 +#: include/views/configuration.item.prototype.edit.php:457 #: include/views/js/configuration.discovery.edit.js.php:64 items.php:124 msgid "SNMP OID" msgstr "SNMP OID" #: disc_prototypes.php:107 host_discovery.php:95 include/forms.inc.php:428 -#: include/views/configuration.host.discovery.edit.php:405 -#: include/views/configuration.item.edit.php:501 -#: include/views/configuration.item.massupdate.php:185 -#: include/views/configuration.item.prototype.edit.php:484 +#: include/views/configuration.host.discovery.edit.php:390 +#: include/views/configuration.item.edit.php:487 +#: include/views/configuration.item.massupdate.php:182 +#: include/views/configuration.item.prototype.edit.php:469 #: include/views/configuration.item.prototype.massupdate.php:178 #: include/views/js/configuration.discovery.edit.js.php:48 items.php:117 msgid "SNMP community" @@ -14078,9 +14095,9 @@ msgid "SQL count: %1$s (selects: %2$s | executes: %3$s)" msgstr "SQL запросов: %1$s (selects: %2$s | executes: %3$s)" #: include/items.inc.php:1680 -#: include/views/configuration.host.discovery.edit.php:501 -#: include/views/configuration.item.edit.php:649 -#: include/views/configuration.item.prototype.edit.php:580 +#: include/views/configuration.host.discovery.edit.php:490 +#: include/views/configuration.item.edit.php:636 +#: include/views/configuration.item.prototype.edit.php:567 msgid "SQL query" msgstr "SQL запрос" @@ -14107,40 +14124,40 @@ msgstr "SSH" msgid "SSH agent" msgstr "SSH агент" -#: include/views/configuration.host.discovery.edit.php:330 +#: include/views/configuration.host.discovery.edit.php:316 #: include/views/configuration.httpconf.edit.php:175 -#: include/views/configuration.item.edit.php:371 -#: include/views/configuration.item.prototype.edit.php:359 +#: include/views/configuration.item.edit.php:359 +#: include/views/configuration.item.prototype.edit.php:344 msgid "SSL certificate file" msgstr "Файл SSL сертификата" -#: include/views/configuration.host.discovery.edit.php:339 +#: include/views/configuration.host.discovery.edit.php:324 #: include/views/configuration.httpconf.edit.php:178 -#: include/views/configuration.item.edit.php:379 -#: include/views/configuration.item.prototype.edit.php:367 +#: include/views/configuration.item.edit.php:366 +#: include/views/configuration.item.prototype.edit.php:351 msgid "SSL key file" msgstr "Файл SSL ключа" -#: include/views/configuration.host.discovery.edit.php:347 +#: include/views/configuration.host.discovery.edit.php:331 #: include/views/configuration.httpconf.edit.php:181 -#: include/views/configuration.item.edit.php:387 -#: include/views/configuration.item.prototype.edit.php:375 +#: include/views/configuration.item.edit.php:373 +#: include/views/configuration.item.prototype.edit.php:358 msgid "SSL key password" msgstr "Пароль к SSL ключу" #: app/views/administration.mediatype.edit.php:88 -#: include/views/configuration.host.discovery.edit.php:321 +#: include/views/configuration.host.discovery.edit.php:308 #: include/views/configuration.httpconf.edit.php:172 -#: include/views/configuration.item.edit.php:362 -#: include/views/configuration.item.prototype.edit.php:350 +#: include/views/configuration.item.edit.php:351 +#: include/views/configuration.item.prototype.edit.php:336 msgid "SSL verify host" msgstr "Проверка SSL хоста" #: app/views/administration.mediatype.edit.php:87 -#: include/views/configuration.host.discovery.edit.php:312 +#: include/views/configuration.host.discovery.edit.php:300 #: include/views/configuration.httpconf.edit.php:169 -#: include/views/configuration.item.edit.php:353 -#: include/views/configuration.item.prototype.edit.php:341 +#: include/views/configuration.item.edit.php:343 +#: include/views/configuration.item.prototype.edit.php:328 msgid "SSL verify peer" msgstr "Проверка SSL узла" @@ -14164,7 +14181,7 @@ msgstr "Sans-Serif" msgid "Sat" msgstr "Сб" -#: include/forms.inc.php:1937 include/forms.inc.php:2052 +#: include/forms.inc.php:2185 include/forms.inc.php:2300 #: include/func.inc.php:140 include/func.inc.php:230 jsLoader.php:150 msgid "Saturday" msgstr "Суббота" @@ -14190,14 +14207,14 @@ msgstr "Запланировано" msgid "Scheduled check" msgstr "Запланированная проверка" -#: include/views/configuration.host.discovery.edit.php:524 -#: include/views/configuration.item.edit.php:708 -#: include/views/configuration.item.edit.php:715 -#: include/views/configuration.item.massupdate.php:466 -#: include/views/configuration.item.prototype.edit.php:635 -#: include/views/configuration.item.prototype.massupdate.php:444 +#: include/views/configuration.host.discovery.edit.php:512 +#: include/views/configuration.item.edit.php:695 +#: include/views/configuration.item.edit.php:702 +#: include/views/configuration.item.massupdate.php:348 +#: include/views/configuration.item.prototype.edit.php:622 +#: include/views/configuration.item.prototype.massupdate.php:344 #: include/views/js/common.item.edit.js.php:10 -#: include/views/js/configuration.item.massupdate.js.php:10 +#: include/views/js/configuration.item.massupdate.js.php:14 msgid "Scheduling" msgstr "По расписанию" @@ -14370,7 +14387,7 @@ msgstr "Скрипты" msgid "Search" msgstr "Поиск" -#: app/views/administration.authentication.edit.php:98 +#: app/views/administration.authentication.edit.php:104 msgid "Search attribute" msgstr "Атрибут поиска" @@ -14410,20 +14427,20 @@ msgstr "Вторичное ник-имя для контакта" msgid "Seconds" msgstr "Секунд" -#: include/views/configuration.host.discovery.edit.php:423 -#: include/views/configuration.item.edit.php:530 -#: include/views/configuration.item.massupdate.php:209 -#: include/views/configuration.item.prototype.edit.php:502 +#: include/views/configuration.host.discovery.edit.php:404 +#: include/views/configuration.item.edit.php:516 +#: include/views/configuration.item.massupdate.php:203 +#: include/views/configuration.item.prototype.edit.php:481 #: include/views/configuration.item.prototype.massupdate.php:199 #: include/views/js/configuration.discovery.edit.js.php:86 msgid "Security level" msgstr "Уровень безопасности" #: include/forms.inc.php:432 -#: include/views/configuration.host.discovery.edit.php:411 -#: include/views/configuration.item.edit.php:507 -#: include/views/configuration.item.massupdate.php:201 -#: include/views/configuration.item.prototype.edit.php:490 +#: include/views/configuration.host.discovery.edit.php:396 +#: include/views/configuration.item.edit.php:493 +#: include/views/configuration.item.massupdate.php:196 +#: include/views/configuration.item.prototype.edit.php:475 #: include/views/configuration.item.prototype.massupdate.php:192 #: include/views/js/configuration.discovery.edit.js.php:79 msgid "Security name" @@ -14451,9 +14468,9 @@ msgstr "Имя безопасности" #: include/views/configuration.graph.edit.php:185 #: include/views/configuration.graph.edit.php:266 #: include/views/configuration.item.edit.php:91 -#: include/views/configuration.item.prototype.edit.php:79 -#: include/views/configuration.item.prototype.edit.php:394 -#: include/views/configuration.item.prototype.massupdate.php:604 +#: include/views/configuration.item.prototype.edit.php:77 +#: include/views/configuration.item.prototype.edit.php:377 +#: include/views/configuration.item.prototype.massupdate.php:504 #: include/views/configuration.services.edit.php:90 #: include/views/js/monitoring.sysmaps.js.php:191 #: include/views/js/monitoring.sysmaps.js.php:210 @@ -14473,8 +14490,8 @@ msgstr "Выбрать" #: app/views/popup.triggerexpr.php:72 #: include/views/configuration.graph.edit.php:206 #: include/views/configuration.graph.edit.php:287 -#: include/views/configuration.item.prototype.edit.php:411 -#: include/views/configuration.item.prototype.massupdate.php:620 +#: include/views/configuration.item.prototype.edit.php:394 +#: include/views/configuration.item.prototype.massupdate.php:520 msgid "Select prototype" msgstr "Выбрать прототип" @@ -14578,7 +14595,7 @@ msgstr "Сен." msgid "Separated" msgstr "Раздельно" -#: include/forms.inc.php:1975 include/func.inc.php:124 +#: include/forms.inc.php:2223 include/func.inc.php:124 #: include/func.inc.php:261 jsLoader.php:141 msgid "September" msgstr "Сентябрь" @@ -14716,9 +14733,7 @@ msgstr "Сессия завершена, пожалуйста, зайдите п msgid "Set custom time period" msgstr "Задать пользовательский период времени" -#: include/views/configuration.item.edit.php:1079 -#: include/views/configuration.item.prototype.edit.php:912 -#: include/views/js/common.item.edit.js.php:82 +#: include/forms.inc.php:1543 include/views/js/item.preprocessing.js.php:51 msgid "Set error to" msgstr "" @@ -14726,9 +14741,7 @@ msgstr "" msgid "Set host inventory mode" msgstr "Установить режим инвентарных данных узлов сети" -#: include/views/configuration.item.edit.php:1078 -#: include/views/configuration.item.prototype.edit.php:911 -#: include/views/js/common.item.edit.js.php:81 +#: include/forms.inc.php:1542 include/views/js/item.preprocessing.js.php:50 msgid "Set value to" msgstr "" @@ -14924,10 +14937,10 @@ msgstr "Отображать только неподтвержденные" msgid "Show unavailable maps" msgstr "Отображать недоступные карты" -#: include/views/configuration.item.edit.php:841 -#: include/views/configuration.item.massupdate.php:561 -#: include/views/configuration.item.prototype.edit.php:714 -#: include/views/configuration.item.prototype.massupdate.php:541 +#: include/views/configuration.item.edit.php:826 +#: include/views/configuration.item.massupdate.php:442 +#: include/views/configuration.item.prototype.edit.php:701 +#: include/views/configuration.item.prototype.massupdate.php:441 msgid "Show value" msgstr "Отображение значения" @@ -14959,7 +14972,7 @@ msgstr "Выход" msgid "Simple" msgstr "Простой" -#: include/items.inc.php:1750 +#: include/items.inc.php:1741 msgid "Simple change" msgstr "Простое изменение" @@ -15259,7 +15272,7 @@ msgstr "Статическое" #: include/views/configuration.httpconf.list.php:95 #: include/views/configuration.item.list.php:71 #: include/views/configuration.item.list.php:152 -#: include/views/configuration.item.massupdate.php:536 +#: include/views/configuration.item.massupdate.php:420 #: include/views/configuration.triggers.list.php:46 #: include/views/configuration.triggers.list.php:171 srv_status.php:146 msgid "Status" @@ -15351,7 +15364,7 @@ msgstr "Остановить" msgid "Straight" msgstr "Straight" -#: include/items.inc.php:1735 +#: include/items.inc.php:1728 include/items.inc.php:1732 msgid "Structured data" msgstr "Составные данные" @@ -15404,7 +15417,7 @@ msgstr "Суммарная статистика входящего и исход msgid "Sun" msgstr "Вс" -#: include/forms.inc.php:1942 include/forms.inc.php:2057 +#: include/forms.inc.php:2190 include/forms.inc.php:2305 #: include/func.inc.php:142 include/func.inc.php:224 jsLoader.php:151 msgid "Sunday" msgstr "Воскресенье" @@ -15629,9 +15642,9 @@ msgstr "Шаблон" msgid "Template \"%1$s\" already exists." msgstr "Шаблон \"%1$s\" уже существует." -#: include/classes/api/services/CHostGroup.php:1454 +#: include/classes/api/services/CHostGroup.php:1471 #: include/classes/api/services/CTemplate.php:368 -#: include/classes/api/services/CTemplate.php:988 +#: include/classes/api/services/CTemplate.php:986 #, c-format msgid "Template \"%1$s\" cannot be without host group." msgstr "Шаблон \"%1$s\" не может быть без группы узлов сети." @@ -15691,25 +15704,25 @@ msgstr "Шаблон обновлен" msgid "Template value" msgstr "Значение шаблона" -#: include/classes/api/services/CTemplate.php:1043 +#: include/classes/api/services/CTemplate.php:1041 #, c-format msgid "Template with the same name \"%1$s\" already exists." msgstr "Шаблон с таким же именем \"%1$s\" уже существует." -#: include/classes/api/services/CHost.php:1757 -#: include/classes/api/services/CHost.php:1980 +#: include/classes/api/services/CHost.php:1793 +#: include/classes/api/services/CHost.php:2016 #, c-format msgid "Template with the same name \"%s\" already exists." msgstr "Шаблон с таким же именем \"%s\" уже существует." #: include/classes/api/services/CTemplate.php:447 -#: include/classes/api/services/CTemplate.php:1008 +#: include/classes/api/services/CTemplate.php:1006 #, c-format msgid "Template with the same visible name \"%1$s\" already exists." msgstr "Шаблон с таким же видимым именем \"%1$s\" уже существует." -#: include/classes/api/services/CHost.php:1763 -#: include/classes/api/services/CHost.php:1988 +#: include/classes/api/services/CHost.php:1799 +#: include/classes/api/services/CHost.php:2024 #, c-format msgid "Template with the same visible name \"%s\" already exists." msgstr "Шаблон с таким же видимым именем \"%s\" уже существует." @@ -15743,7 +15756,7 @@ msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"." msgstr "Шаблоны \"%1$s\" отсоединены от узлов сети \"%2$s\"." #: app/controllers/CControllerPopupTestTriggerExpr.php:147 -#: app/views/administration.authentication.edit.php:140 +#: app/views/administration.authentication.edit.php:150 #: app/views/popup.testtriggerexpr.php:110 #: include/views/administration.general.regularexpressions.edit.php:139 #: include/views/configuration.trigger.prototype.edit.php:239 @@ -15753,7 +15766,7 @@ msgstr "Шаблоны \"%1$s\" отсоединены от узлов сети msgid "Test" msgstr "Тест" -#: app/views/administration.authentication.edit.php:114 +#: app/views/administration.authentication.edit.php:122 msgid "Test authentication" msgstr "Тест аутентификации" @@ -15775,9 +15788,11 @@ msgid "Test string" msgstr "Тестовая строка" #: include/forms.inc.php:355 include/items.inc.php:135 -#: include/items.inc.php:1726 include/views/configuration.item.edit.php:680 -#: include/views/configuration.item.massupdate.php:281 -#: include/views/configuration.item.prototype.edit.php:609 +#: include/items.inc.php:1712 include/items.inc.php:1716 +#: include/items.inc.php:1720 include/items.inc.php:1724 +#: include/views/configuration.item.edit.php:667 +#: include/views/configuration.item.massupdate.php:269 +#: include/views/configuration.item.prototype.edit.php:596 #: include/views/configuration.item.prototype.massupdate.php:264 #: include/views/js/monitoring.sysmaps.js.php:308 #: include/views/js/monitoring.sysmaps.js.php:459 @@ -15929,7 +15944,7 @@ msgstr "В этом году" msgid "Threshold" msgstr "Порог" -#: include/items.inc.php:1774 +#: include/items.inc.php:1784 include/items.inc.php:1788 msgid "Throttling" msgstr "" @@ -15937,7 +15952,7 @@ msgstr "" msgid "Thu" msgstr "Чт" -#: include/forms.inc.php:1927 include/forms.inc.php:2042 +#: include/forms.inc.php:2175 include/forms.inc.php:2290 #: include/func.inc.php:138 include/func.inc.php:228 jsLoader.php:148 msgid "Thursday" msgstr "Четверг" @@ -16018,10 +16033,10 @@ msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\"). msgstr "Часовой пояс для PHP не задан (параметр конфигурации \"date.timezone\")." #: app/views/popup.httpstep.php:147 -#: include/views/configuration.host.discovery.edit.php:162 +#: include/views/configuration.host.discovery.edit.php:159 #: include/views/configuration.httpconf.edit.php:196 #: include/views/configuration.item.edit.php:194 -#: include/views/configuration.item.prototype.edit.php:182 +#: include/views/configuration.item.prototype.edit.php:179 msgid "Timeout" msgstr "Время ожидания" @@ -16132,10 +16147,10 @@ msgstr "Период хранения данных динамики измене msgid "Trend data storage period \"%1$s\"." msgstr "Период хранения данных динамики изменений \"%1$s\"." -#: disc_prototypes.php:198 include/views/configuration.item.edit.php:809 -#: include/views/configuration.item.massupdate.php:524 -#: include/views/configuration.item.prototype.edit.php:688 -#: include/views/configuration.item.prototype.massupdate.php:503 items.php:77 +#: disc_prototypes.php:198 include/views/configuration.item.edit.php:797 +#: include/views/configuration.item.massupdate.php:407 +#: include/views/configuration.item.prototype.edit.php:676 +#: include/views/configuration.item.prototype.massupdate.php:403 items.php:77 msgid "Trend storage period" msgstr "Период хранения динамики изменений" @@ -16175,7 +16190,7 @@ msgstr "Триггер \"%1$s\" уже существует у \"%2$s\"." msgid "Trigger \"%1$s\" belongs to templates with different linkages." msgstr "Триггер \"%1$s\" принадлежит шаблонам с разными связями." -#: include/classes/import/CConfigurationImport.php:1610 +#: include/classes/import/CConfigurationImport.php:1618 #, c-format msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "Триггер \"%1$s\" зависит от триггера \"%2$s\", который не существует." @@ -16296,7 +16311,7 @@ msgstr "Прототип триггера \"%1$s\" принадлежит шаб msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules." msgstr "Прототип триггеров \"%1$s\" содержит прототипы элементов данных из нескольких правил обнаружения." -#: include/classes/import/CConfigurationImport.php:1332 +#: include/classes/import/CConfigurationImport.php:1340 #, c-format msgid "Trigger prototype \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "Прототип триггеров \"%1$s\" зависит от триггера \"%2$s\", который не существует." @@ -16403,7 +16418,7 @@ msgstr "Триггеры удалены" msgid "Triggers top 100" msgstr "100 наиболее активных триггеров" -#: include/items.inc.php:1729 +#: include/items.inc.php:1717 msgid "Trim" msgstr "Обрезать" @@ -16416,7 +16431,7 @@ msgstr "Попытка чтения недоступного свойства \" msgid "Tue" msgstr "Вт" -#: include/forms.inc.php:1917 include/forms.inc.php:2032 +#: include/forms.inc.php:2165 include/forms.inc.php:2280 #: include/func.inc.php:136 include/func.inc.php:226 jsLoader.php:146 msgid "Tuesday" msgstr "Вторник" @@ -16425,7 +16440,7 @@ msgstr "Вторник" msgid "Turkish (tr_TR)" msgstr "Турецкий (tr_TR)" -#: include/classes/api/services/CItem.php:1015 +#: include/classes/api/services/CItem.php:965 #, c-format msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict." msgstr "Два элемента данных (\"%1$s\" и \"%2$s\") не могут заполнять одно поле \"%3$s\" инвентарных данных узла сети, это может привести к конфликту." @@ -16456,22 +16471,22 @@ msgstr "Необходимо выбрать два элемента карты" #: include/views/configuration.action.edit.php:1706 #: include/views/configuration.action.edit.php:2156 #: include/views/configuration.graph.edit.php:332 -#: include/views/configuration.host.discovery.edit.php:56 -#: include/views/configuration.host.discovery.edit.php:61 -#: include/views/configuration.host.discovery.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:54 +#: include/views/configuration.host.discovery.edit.php:59 +#: include/views/configuration.host.discovery.edit.php:506 #: include/views/configuration.host.discovery.list.php:58 #: include/views/configuration.item.edit.php:73 #: include/views/configuration.item.edit.php:78 -#: include/views/configuration.item.edit.php:700 +#: include/views/configuration.item.edit.php:687 #: include/views/configuration.item.list.php:69 -#: include/views/configuration.item.massupdate.php:42 -#: include/views/configuration.item.massupdate.php:455 -#: include/views/configuration.item.prototype.edit.php:61 -#: include/views/configuration.item.prototype.edit.php:66 -#: include/views/configuration.item.prototype.edit.php:629 +#: include/views/configuration.item.massupdate.php:41 +#: include/views/configuration.item.massupdate.php:337 +#: include/views/configuration.item.prototype.edit.php:59 +#: include/views/configuration.item.prototype.edit.php:64 +#: include/views/configuration.item.prototype.edit.php:616 #: include/views/configuration.item.prototype.list.php:57 #: include/views/configuration.item.prototype.massupdate.php:37 -#: include/views/configuration.item.prototype.massupdate.php:433 +#: include/views/configuration.item.prototype.massupdate.php:333 #: include/views/configuration.maintenance.list.php:71 #: include/views/configuration.services.edit.php:170 #: include/views/inventory.host.list.php:67 @@ -16506,17 +16521,17 @@ msgstr "Тип (в порядке убывания)" #: include/views/configuration.action.edit.php:118 #: include/views/configuration.action.edit.php:1155 #: include/views/configuration.correlation.edit.php:91 -#: include/views/configuration.host.discovery.edit.php:594 +#: include/views/configuration.host.discovery.edit.php:582 msgid "Type of calculation" msgstr "Тип вычисления" #: app/controllers/CControllerPopupGeneric.php:213 #: app/controllers/CControllerPopupGeneric.php:276 include/forms.inc.php:348 -#: include/forms.inc.php:842 include/views/configuration.item.edit.php:668 -#: include/views/configuration.item.edit.php:674 -#: include/views/configuration.item.massupdate.php:274 -#: include/views/configuration.item.prototype.edit.php:597 -#: include/views/configuration.item.prototype.edit.php:603 +#: include/forms.inc.php:842 include/views/configuration.item.edit.php:655 +#: include/views/configuration.item.edit.php:661 +#: include/views/configuration.item.massupdate.php:262 +#: include/views/configuration.item.prototype.edit.php:584 +#: include/views/configuration.item.prototype.edit.php:590 #: include/views/configuration.item.prototype.massupdate.php:257 msgid "Type of information" msgstr "Тип информации" @@ -16535,15 +16550,15 @@ msgid "UNKNOWN" msgstr "НЕИЗВЕСТНО" #: app/views/popup.httpstep.php:50 app/views/popup.triggerwizard.php:183 -#: disc_prototypes.php:207 host_discovery.php:152 +#: disc_prototypes.php:207 host_discovery.php:153 #: include/classes/widgets/CWidgetConfig.php:50 #: include/classes/widgets/forms/CWidgetFormUrl.php:31 #: include/screens.inc.php:44 -#: include/views/configuration.host.discovery.edit.php:76 +#: include/views/configuration.host.discovery.edit.php:74 #: include/views/configuration.httpconf.edit.php:197 -#: include/views/configuration.item.edit.php:108 -#: include/views/configuration.item.massupdate.php:105 -#: include/views/configuration.item.prototype.edit.php:97 +#: include/views/configuration.item.edit.php:109 +#: include/views/configuration.item.massupdate.php:104 +#: include/views/configuration.item.prototype.edit.php:95 #: include/views/configuration.item.prototype.massupdate.php:100 #: include/views/configuration.trigger.prototype.edit.php:535 #: include/views/configuration.triggers.edit.php:569 @@ -16569,7 +16584,7 @@ msgstr "URL B" msgid "URL C" msgstr "URL C" -#: include/views/js/common.item.edit.js.php:732 +#: include/views/js/common.item.edit.js.php:323 #: include/views/js/configuration.httpconf.edit.js.php:654 msgid "URL is not properly encoded." msgstr "URL закодирован некорректно." @@ -16653,9 +16668,9 @@ msgstr "Разблокировать выбранных пользователе #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:154 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227 -#: include/views/configuration.item.edit.php:685 -#: include/views/configuration.item.massupdate.php:288 -#: include/views/configuration.item.prototype.edit.php:614 +#: include/views/configuration.item.edit.php:673 +#: include/views/configuration.item.massupdate.php:275 +#: include/views/configuration.item.prototype.edit.php:602 #: include/views/configuration.item.prototype.massupdate.php:270 msgid "Units" msgstr "Единица измерения" @@ -16750,42 +16765,42 @@ msgstr "Отсоединить от шаблона" msgid "Unlink from templates" msgstr "Отсоединить от шаблонов" -#: include/classes/api/services/CHostGeneral.php:630 +#: include/classes/api/services/CHostGeneral.php:626 #, c-format msgid "Unlinked: Application \"%1$s\" on \"%2$s\"." msgstr "Отсоединено: Группа элементов данных \"%1$s\" от \"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:376 +#: include/classes/api/services/CHostGeneral.php:372 #, c-format msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"." msgstr "Отсоединено: Правило обнаружения \"%1$s\" от \"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:533 +#: include/classes/api/services/CHostGeneral.php:529 #, c-format msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"." msgstr "Отсоединено: График \"%1$s\" от \"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:517 +#: include/classes/api/services/CHostGeneral.php:513 #, c-format msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"." msgstr "Отсоединено: Прототип графиков \"%1$s\" от \"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:466 +#: include/classes/api/services/CHostGeneral.php:462 #, c-format msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"." msgstr "Отсоединено: Прототип узлов сети \"%1$s\" от \"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:392 +#: include/classes/api/services/CHostGeneral.php:388 #, c-format msgid "Unlinked: Item \"%1$s\" on \"%2$s\"." msgstr "Отсоединено: Элемент данных \"%1$s\" от \"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:411 +#: include/classes/api/services/CHostGeneral.php:407 #, c-format msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"." msgstr "Отсоединено: Прототип элементов данных \"%1$s\" от \"%2$s\"." -#: include/classes/api/services/CHostGeneral.php:572 +#: include/classes/api/services/CHostGeneral.php:568 #, c-format msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"." msgstr "Отсоединено: Веб-сценарий \"%1$s\" от \"%2$s\"." @@ -16809,7 +16824,7 @@ msgstr "Неподдерживаемый формат импорта \"%1$s\"." msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для действия условия фильтра \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1118 +#: include/classes/api/services/CDiscoveryRule.php:1282 #, c-format msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для правила обнаружения условия фильтра \"%1$s\"." @@ -16819,7 +16834,7 @@ msgstr "Неподдерживаемый параметр \"%2$s\" для пра msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для фильтра в действии \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1086 +#: include/classes/api/services/CDiscoveryRule.php:1250 #, c-format msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"." @@ -16834,7 +16849,7 @@ msgctxt "discovery status" msgid "Up" msgstr "Доступен" -#: app/views/administration.authentication.edit.php:139 +#: app/views/administration.authentication.edit.php:149 #: app/views/administration.mediatype.edit.php:241 #: app/views/administration.proxy.edit.php:132 #: app/views/administration.script.edit.php:127 @@ -16864,16 +16879,16 @@ msgstr "Доступен" #: include/views/configuration.correlation.edit.php:276 #: include/views/configuration.discovery.edit.php:108 #: include/views/configuration.graph.edit.php:449 -#: include/views/configuration.host.discovery.edit.php:709 +#: include/views/configuration.host.discovery.edit.php:771 #: include/views/configuration.host.edit.php:810 #: include/views/configuration.hostgroups.edit.php:57 #: include/views/configuration.host.massupdate.php:371 #: include/views/configuration.host.prototype.edit.php:434 #: include/views/configuration.httpconf.edit.php:306 -#: include/views/configuration.item.edit.php:1191 -#: include/views/configuration.item.massupdate.php:695 -#: include/views/configuration.item.prototype.edit.php:1003 -#: include/views/configuration.item.prototype.massupdate.php:689 +#: include/views/configuration.item.edit.php:953 +#: include/views/configuration.item.massupdate.php:577 +#: include/views/configuration.item.prototype.edit.php:768 +#: include/views/configuration.item.prototype.massupdate.php:589 #: include/views/configuration.maintenance.edit.php:134 #: include/views/configuration.maintenance.edit.php:285 #: include/views/configuration.services.edit.php:353 @@ -16897,12 +16912,12 @@ msgstr "Обновить существующее" #: discoveryconf.php:39 disc_prototypes.php:58 host_discovery.php:54 #: include/forms.inc.php:394 include/views/configuration.discovery.edit.php:59 -#: include/views/configuration.host.discovery.edit.php:508 +#: include/views/configuration.host.discovery.edit.php:496 #: include/views/configuration.httpconf.edit.php:80 -#: include/views/configuration.item.edit.php:690 -#: include/views/configuration.item.massupdate.php:510 -#: include/views/configuration.item.prototype.edit.php:619 -#: include/views/configuration.item.prototype.massupdate.php:489 items.php:57 +#: include/views/configuration.item.edit.php:677 +#: include/views/configuration.item.massupdate.php:393 +#: include/views/configuration.item.prototype.edit.php:606 +#: include/views/configuration.item.prototype.massupdate.php:389 items.php:57 #: items.php:306 msgid "Update interval" msgstr "Интервал обновления" @@ -16944,7 +16959,7 @@ msgstr "Обновлено: %s" msgid "Upload" msgstr "Загрузить" -#: include/html.inc.php:542 include/html.inc.php:555 +#: include/html.inc.php:542 include/html.inc.php:545 msgid "Upper level maps" msgstr "Карты верхнего уровня" @@ -17157,18 +17172,18 @@ msgstr "Меню пользователя" #: include/views/configuration.action.edit.php:958 #: include/views/configuration.action.edit.php:1737 #: include/views/configuration.action.edit.php:2201 -#: include/views/configuration.host.discovery.edit.php:294 -#: include/views/configuration.host.discovery.edit.php:471 -#: include/views/configuration.item.edit.php:335 -#: include/views/configuration.item.edit.php:618 -#: include/views/configuration.item.massupdate.php:307 -#: include/views/configuration.item.prototype.edit.php:323 -#: include/views/configuration.item.prototype.edit.php:550 +#: include/views/configuration.host.discovery.edit.php:284 +#: include/views/configuration.host.discovery.edit.php:460 +#: include/views/configuration.item.edit.php:327 +#: include/views/configuration.item.edit.php:605 +#: include/views/configuration.item.massupdate.php:292 +#: include/views/configuration.item.prototype.edit.php:312 +#: include/views/configuration.item.prototype.edit.php:537 #: include/views/configuration.item.prototype.massupdate.php:287 items.php:90 msgid "User name" msgstr "Имя пользователя" -#: app/views/administration.authentication.edit.php:120 +#: app/views/administration.authentication.edit.php:129 msgid "User password" msgstr "Пароль пользователя" @@ -17232,7 +17247,7 @@ msgstr "Пользователь/Получатель" #: app/views/administration.mediatype.edit.php:95 #: app/views/administration.mediatype.edit.php:159 #: app/views/administration.mediatype.list.php:93 disc_prototypes.php:259 -#: host_discovery.php:201 include/views/configuration.host.edit.php:666 +#: host_discovery.php:202 include/views/configuration.host.edit.php:666 #: include/views/configuration.host.prototype.edit.php:335 #: include/views/general.login.php:60 index.php:33 items.php:257 msgid "Username" @@ -17450,7 +17465,9 @@ msgstr "Размер неразделяемого пространства хр msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name" msgstr "Время работы виртуальной машины VMware, <url> - URL службы VMware, <uuid> - имя хоста виртуальной машины VMware" -#: include/items.inc.php:1763 +#: include/items.inc.php:1760 include/items.inc.php:1764 +#: include/items.inc.php:1768 include/items.inc.php:1772 +#: include/items.inc.php:1776 include/items.inc.php:1780 msgid "Validation" msgstr "" @@ -17463,14 +17480,14 @@ msgstr "" #: include/classes/screens/CScreenPlainText.php:53 #: include/views/administration.general.macros.edit.php:38 #: include/views/administration.general.valuemapping.edit.php:55 -#: include/views/configuration.host.discovery.edit.php:110 -#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:109 +#: include/views/configuration.host.discovery.edit.php:201 #: include/views/configuration.httpconf.edit.php:125 -#: include/views/configuration.item.edit.php:142 -#: include/views/configuration.item.edit.php:237 -#: include/views/configuration.item.massupdate.php:154 -#: include/views/configuration.item.prototype.edit.php:130 -#: include/views/configuration.item.prototype.edit.php:225 +#: include/views/configuration.item.edit.php:144 +#: include/views/configuration.item.edit.php:236 +#: include/views/configuration.item.massupdate.php:152 +#: include/views/configuration.item.prototype.edit.php:129 +#: include/views/configuration.item.prototype.edit.php:221 #: include/views/configuration.item.prototype.massupdate.php:148 #: include/views/configuration.triggers.list.php:55 #: include/views/configuration.triggers.list.php:167 @@ -17652,7 +17669,7 @@ msgstr "Размер виртуального пространства в бай msgid "Visible name" msgstr "Видимое имя" -#: include/classes/api/services/CHost.php:1891 +#: include/classes/api/services/CHost.php:1927 msgid "Visible name cannot be empty if host name is missing." msgstr "Видимое имя не может быть пустым, если имя узла сети не заполнено." @@ -17714,7 +17731,7 @@ msgstr "Веб-сценарий \"%1$s\" уже существует у узла msgid "Web scenario \"%1$s\" already exists." msgstr "Веб-сценарий \"%1$s\" уже существует." -#: include/classes/import/CConfigurationImport.php:1382 +#: include/classes/import/CConfigurationImport.php:1390 #, c-format msgid "Web scenario \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist." msgstr "Веб-сценарий \"%1$s\" на \"%2$s\": группа элементов данных \"%3$s\" не существует." @@ -17755,12 +17772,12 @@ msgstr "Веб-сценарии" msgid "Wed" msgstr "Ср" -#: include/forms.inc.php:1922 include/forms.inc.php:2037 +#: include/forms.inc.php:2170 include/forms.inc.php:2285 #: include/func.inc.php:137 include/func.inc.php:227 jsLoader.php:147 msgid "Wednesday" msgstr "Среда" -#: app/views/report.services.php:35 include/forms.inc.php:1876 +#: app/views/report.services.php:35 include/forms.inc.php:2124 #: include/maintenances.inc.php:35 report4.php:108 msgid "Weekly" msgstr "Еженедельно" @@ -17860,8 +17877,8 @@ msgstr "Запись" msgid "Wrong fields for dependency for service \"%1$s\"." msgstr "Ошибочные поля для зависимости услуги \"%1$s\"." -#: include/classes/api/services/CHost.php:1605 -#: include/classes/api/services/CHost.php:1786 +#: include/classes/api/services/CHost.php:1641 +#: include/classes/api/services/CHost.php:1822 #, c-format msgid "Wrong fields for host \"%1$s\"." msgstr "Ошибочные поля для узла сети \"%1$s\"." @@ -17940,23 +17957,27 @@ msgstr "X1" msgid "X2" msgstr "X2" -#: include/items.inc.php:1737 +#: include/items.inc.php:1729 msgid "XML XPath" msgstr "XML XPath" -#: include/views/configuration.host.discovery.edit.php:173 -#: include/views/configuration.item.edit.php:205 -#: include/views/configuration.item.massupdate.php:120 -#: include/views/configuration.item.prototype.edit.php:193 +#: include/views/configuration.host.discovery.edit.php:169 +#: include/views/configuration.item.edit.php:204 +#: include/views/configuration.item.massupdate.php:118 +#: include/views/configuration.item.prototype.edit.php:189 #: include/views/configuration.item.prototype.massupdate.php:114 msgid "XML data" msgstr "XML данные" -#: include/classes/api/services/CItemGeneral.php:2222 +#: include/classes/api/services/CItemGeneral.php:2185 #: include/classes/import/readers/CXmlImportReader.php:35 msgid "XML is empty" msgstr "XML пустой" +#: include/forms.inc.php:1469 include/views/js/item.preprocessing.js.php:154 +msgid "XPath" +msgstr "" + #: include/views/js/monitoring.sysmaps.js.php:248 #: include/views/js/monitoring.sysmaps.js.php:384 msgid "Y" @@ -18008,7 +18029,7 @@ msgstr "Y1" msgid "Y2" msgstr "Y2" -#: include/forms.inc.php:2092 +#: include/forms.inc.php:2340 #: include/views/configuration.maintenance.edit.php:57 #: include/views/configuration.maintenance.edit.php:63 #: include/views/configuration.services.edit.php:246 @@ -18021,7 +18042,7 @@ msgstr "YYYY-MM-DD hh:mm" #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 msgctxt "XML date and time format" msgid "YYYY-MM-DDThh:mm:ssZ" msgstr "YYYY-MM-DDThh:mm:ssZ" @@ -18108,8 +18129,8 @@ msgstr "Вы не указали цели глобального скрипта #: include/classes/api/services/CTemplate.php:388 #: include/classes/api/services/CTemplate.php:529 #: include/classes/api/services/CTemplate.php:561 -#: include/classes/api/services/CTemplate.php:980 -#: include/classes/api/services/CTemplate.php:1085 +#: include/classes/api/services/CTemplate.php:978 +#: include/classes/api/services/CTemplate.php:1083 #: include/classes/api/services/CUserMacro.php:266 #: include/classes/api/services/CUserMacro.php:350 #: include/classes/api/services/CUserMacro.php:443 @@ -18193,7 +18214,7 @@ msgstr "Внутренний Zabbix" msgid "Zabbix internal authentication" msgstr "Внутренняя аутентификация Zabbix" -#: app/views/administration.authentication.edit.php:43 +#: app/views/administration.authentication.edit.php:44 msgid "Zabbix login form" msgstr "Диалог входа в систему Zabbix" @@ -18267,7 +18288,7 @@ msgstr "[Ошибочное значение дня: \"%s\" ]" msgid "[Wrong value for month: \"%s\" ]" msgstr "[Ошибочное значение месяца: \"%s\" ]" -#: include/classes/validators/CApiInputValidator.php:593 +#: include/classes/validators/CApiInputValidator.php:597 msgid "a boolean is expected" msgstr "ожидается логическое" @@ -18275,33 +18296,37 @@ msgstr "ожидается логическое" #: include/classes/api/services/CTriggerGeneral.php:257 #: include/classes/api/services/CUser.php:649 #: include/classes/import/validators/CXmlValidatorGeneral.php:193 -#: include/classes/validators/CApiInputValidator.php:230 +#: include/classes/validators/CApiInputValidator.php:234 #: include/classes/validators/CNewValidator.php:278 msgid "a character string is expected" msgstr "ожидается строка символов" -#: include/classes/validators/CApiInputValidator.php:271 +#: include/classes/validators/CApiInputValidator.php:275 msgid "a hexadecimal colour code (6 symbols) is expected" msgstr "ожидается код цвета в шестнадцатеричном формате (6 символов)" -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:554 -#: include/classes/validators/CApiInputValidator.php:952 +#: include/classes/validators/CApiInputValidator.php:1059 +msgid "a low-level discovery macro is expected" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:421 +#: include/classes/validators/CApiInputValidator.php:558 +#: include/classes/validators/CApiInputValidator.php:956 msgid "a number is expected" msgstr "ожидается число" #: app/controllers/CControllerPopupHttpStep.php:109 -#: include/classes/validators/CApiInputValidator.php:422 -#: include/classes/validators/CApiInputValidator.php:564 -#: include/classes/validators/CApiInputValidator.php:959 -#: include/classes/validators/CApiInputValidator.php:1185 +#: include/classes/validators/CApiInputValidator.php:426 +#: include/classes/validators/CApiInputValidator.php:568 +#: include/classes/validators/CApiInputValidator.php:963 +#: include/classes/validators/CApiInputValidator.php:1218 msgid "a number is too large" msgstr "число слишком большое" #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CItemGeneral.php:1233 -#: include/classes/api/services/CItemGeneral.php:1306 -#: include/classes/api/services/CItemGeneral.php:1316 +#: include/classes/api/services/CItemGeneral.php:1323 +#: include/classes/api/services/CItemGeneral.php:1396 +#: include/classes/api/services/CItemGeneral.php:1406 #: include/classes/api/services/CScreen.php:423 msgid "a numeric value is expected" msgstr "ожидается цифровое значение" @@ -18311,23 +18336,23 @@ msgid "a time is expected" msgstr "ожидается время" #: app/controllers/CControllerPopupMedia.php:110 -#: include/classes/validators/CApiInputValidator.php:1093 +#: include/classes/validators/CApiInputValidator.php:1126 #: include/validate.inc.php:216 msgid "a time period is expected" msgstr "ожидается период времени" -#: include/classes/validators/CApiInputValidator.php:1059 +#: include/classes/validators/CApiInputValidator.php:1092 #: include/validate.inc.php:235 msgid "a time range is expected" msgstr "ожидался период времени" #: app/controllers/CControllerPopupHttpStep.php:103 -#: include/classes/validators/CApiInputValidator.php:1174 +#: include/classes/validators/CApiInputValidator.php:1207 #: include/validate.inc.php:227 include/validate.inc.php:570 msgid "a time unit is expected" msgstr "ожидается единица времени" -#: include/classes/validators/CApiInputValidator.php:1026 +#: include/classes/validators/CApiInputValidator.php:1030 msgid "a user macro is expected" msgstr "ожидается пользовательский макрос" @@ -18370,18 +18395,18 @@ msgstr "все способы оповещения" #: include/classes/api/services/CDRule.php:463 #: include/classes/api/services/CDRule.php:470 -#: include/classes/api/services/CItemGeneral.php:2161 -#: include/classes/api/services/CItemGeneral.php:2185 +#: include/classes/api/services/CItemGeneral.php:2124 +#: include/classes/api/services/CItemGeneral.php:2148 #: include/classes/import/validators/CXmlValidatorGeneral.php:207 -#: include/classes/validators/CApiInputValidator.php:370 -#: include/classes/validators/CApiInputValidator.php:508 -#: include/classes/validators/CApiInputValidator.php:648 -#: include/classes/validators/CApiInputValidator.php:756 -#: include/classes/validators/CApiInputValidator.php:798 +#: include/classes/validators/CApiInputValidator.php:374 +#: include/classes/validators/CApiInputValidator.php:512 +#: include/classes/validators/CApiInputValidator.php:652 +#: include/classes/validators/CApiInputValidator.php:760 +#: include/classes/validators/CApiInputValidator.php:802 msgid "an array is expected" msgstr "ожидается массив" -#: include/classes/validators/CApiInputValidator.php:727 +#: include/classes/validators/CApiInputValidator.php:731 msgid "an array or a character string is expected" msgstr "ожидается массив или строка символов" @@ -18390,7 +18415,7 @@ msgstr "ожидается массив или строка символов" msgid "an empty string is expected" msgstr "ожидается пустая строка" -#: include/classes/api/services/CHost.php:1548 +#: include/classes/api/services/CHost.php:1584 msgid "an even number of hexadecimal characters is expected" msgstr "ожидается четное количество шестнадцатеричных символов" @@ -18481,6 +18506,7 @@ msgstr "нельзя изменить" #: include/classes/api/services/CCorrelation.php:1101 #: include/classes/api/services/CCorrelation.php:1118 #: include/classes/api/services/CCorrelation.php:1137 +#: include/classes/api/services/CDiscoveryRule.php:1423 #: include/classes/api/services/CDRule.php:203 #: include/classes/api/services/CDRule.php:209 #: include/classes/api/services/CDRule.php:319 @@ -18488,19 +18514,19 @@ msgstr "нельзя изменить" #: include/classes/api/services/CDRule.php:357 #: include/classes/api/services/CDRule.php:512 #: include/classes/api/services/CEvent.php:847 -#: include/classes/api/services/CHost.php:1536 -#: include/classes/api/services/CHost.php:1542 +#: include/classes/api/services/CHost.php:1572 +#: include/classes/api/services/CHost.php:1578 #: include/classes/api/services/CHttpTest.php:982 #: include/classes/api/services/CItemGeneral.php:485 #: include/classes/api/services/CItemGeneral.php:512 #: include/classes/api/services/CItemGeneral.php:518 #: include/classes/api/services/CItemGeneral.php:524 -#: include/classes/api/services/CItemGeneral.php:1201 -#: include/classes/api/services/CItemGeneral.php:1223 -#: include/classes/api/services/CItemGeneral.php:1254 -#: include/classes/api/services/CItemGeneral.php:1268 -#: include/classes/api/services/CItemGeneral.php:1294 -#: include/classes/api/services/CItemGeneral.php:1465 +#: include/classes/api/services/CItemGeneral.php:1291 +#: include/classes/api/services/CItemGeneral.php:1313 +#: include/classes/api/services/CItemGeneral.php:1344 +#: include/classes/api/services/CItemGeneral.php:1358 +#: include/classes/api/services/CItemGeneral.php:1384 +#: include/classes/api/services/CItemGeneral.php:1555 #: include/classes/api/services/CMapElement.php:95 #: include/classes/api/services/CMapElement.php:114 #: include/classes/api/services/CMapElement.php:152 @@ -18521,19 +18547,19 @@ msgstr "нельзя изменить" #: include/classes/api/services/CUserGroup.php:463 #: include/classes/api/services/CUser.php:532 #: include/classes/api/services/CUser.php:660 -#: include/classes/validators/CApiInputValidator.php:240 -#: include/classes/validators/CApiInputValidator.php:375 -#: include/classes/validators/CApiInputValidator.php:513 -#: include/classes/validators/CApiInputValidator.php:559 -#: include/classes/validators/CApiInputValidator.php:761 -#: include/classes/validators/CApiInputValidator.php:803 +#: include/classes/validators/CApiInputValidator.php:244 +#: include/classes/validators/CApiInputValidator.php:379 +#: include/classes/validators/CApiInputValidator.php:517 +#: include/classes/validators/CApiInputValidator.php:563 +#: include/classes/validators/CApiInputValidator.php:765 +#: include/classes/validators/CApiInputValidator.php:807 #: include/classes/validators/CNewValidator.php:91 #: include/classes/widgets/forms/CWidgetFormMap.php:101 usergrps.php:341 #: usergrps.php:381 usergrps.php:384 msgid "cannot be empty" msgstr "не может быть пустым" -#: include/classes/api/services/CItemGeneral.php:2177 +#: include/classes/api/services/CItemGeneral.php:2140 msgid "cannot convert to JSON, result value too long" msgstr "не удалось сконвертировать в JSON, значение результата слишком длинное" @@ -18541,6 +18567,10 @@ msgstr "не удалось сконвертировать в JSON, значен msgid "cannot perform Scroll API request, data could be truncated" msgstr "не удалось выполнить Scroll API запрос, данные могут быть обрезаны" +#: include/classes/api/services/CDiscoveryRule.php:1406 +msgid "cannot update property for templated discovery rule" +msgstr "" + #: app/controllers/CControllerPopupTriggerExpr.php:246 msgid "change() - Difference between last and previous value" msgstr "change() - Разница между последним и предыдущим значениями" @@ -18550,11 +18580,8 @@ msgstr "change() - Разница между последним и предыд msgid "check expression starting from \"%1$s\"" msgstr "проверьте выражение начиная с \"%1$s\"" -#: include/classes/api/services/CHostGeneral.php:1024 -#: include/classes/api/services/CItemGeneral.php:1730 -#: include/classes/api/services/CItemGeneral.php:1736 -#: include/classes/api/services/CItemGeneral.php:1973 -#: include/classes/import/CConfigurationImport.php:2611 +#: include/classes/api/services/CItemGeneral.php:1848 +#: include/classes/import/CConfigurationImport.php:2619 msgid "circular item dependency is not allowed" msgstr "закольцованная зависимость элементов данных не разрешена" @@ -18633,7 +18660,7 @@ msgstr "по убыванию" msgid "diff() - Difference between last and preceding values (1 - true, 0 - false)" msgstr "diff() - Разница между последним и предыдущим значениями (1 - правда, 0 - ложь)" -#: include/classes/validators/CApiInputValidator.php:996 +#: include/classes/validators/CApiInputValidator.php:1000 msgid "directory or script name cannot be empty" msgstr "директория или имя скрипта не могут быть пустыми" @@ -18662,8 +18689,8 @@ msgid "does not equal" msgstr "не равно" #: include/actions.inc.php:35 -#: include/views/configuration.host.discovery.edit.php:634 -#: include/views/js/configuration.host.discovery.edit.js.php:25 +#: include/views/configuration.host.discovery.edit.php:622 +#: include/views/js/configuration.host.discovery.edit.js.php:27 msgid "does not match" msgstr "не соответствует" @@ -18672,7 +18699,7 @@ msgstr "не соответствует" msgid "equals" msgstr "равно" -#: include/views/js/common.item.edit.js.php:311 +#: include/views/js/item.preprocessing.js.php:266 msgid "error message" msgstr "" @@ -18688,11 +18715,11 @@ msgstr "пустое выражение" msgid "failed to parse JSON" msgstr "ошибка при разборе JSON" -#: include/forms.inc.php:2018 include/maintenances.inc.php:111 +#: include/forms.inc.php:2266 include/maintenances.inc.php:111 msgid "first" msgstr "первый" -#: include/classes/api/services/CItemGeneral.php:1276 +#: include/classes/api/services/CItemGeneral.php:1366 msgid "first parameter is expected" msgstr "ожидается первый параметр" @@ -18700,7 +18727,7 @@ msgstr "ожидается первый параметр" msgid "forecast() - Forecast for next t seconds based on period T" msgstr "forecast() - Прогноз значения через t секунд на основе периода Т" -#: include/forms.inc.php:2021 include/maintenances.inc.php:114 +#: include/forms.inc.php:2269 include/maintenances.inc.php:114 msgid "fourth" msgstr "четвёртый" @@ -18708,10 +18735,10 @@ 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 "" -#: include/views/configuration.item.edit.php:772 -#: include/views/configuration.item.edit.php:777 -#: include/views/configuration.item.edit.php:798 -#: include/views/configuration.item.edit.php:803 +#: include/views/configuration.item.edit.php:759 +#: include/views/configuration.item.edit.php:764 +#: include/views/configuration.item.edit.php:785 +#: include/views/configuration.item.edit.php:790 msgctxt "item_form" msgid "global housekeeping settings" msgstr "глобальные настройки очистки истории" @@ -18751,7 +18778,7 @@ msgstr "узел сети без наблюдения" msgid "host pattern" msgstr "шаблон узла сети" -#: include/classes/api/services/CItemGeneral.php:1753 +#: include/classes/api/services/CItemGeneral.php:1831 msgid "hostid of dependent item and master item should match" msgstr "hostid зависимого элемента данных и мастер элемента данных должны совпадать" @@ -18794,7 +18821,7 @@ msgstr "внутренний" msgid "invalid address range \"%1$s\"" msgstr "ошибочный диапазон адресов \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:235 +#: include/classes/validators/CApiInputValidator.php:239 msgid "invalid byte sequence in UTF-8" msgstr "ошибочная последовательность байт в UTF-8" @@ -18809,15 +18836,15 @@ msgstr "ошибочная задержка" msgid "invalid history storage period" msgstr "недопустимый период хранения истории" -#: include/classes/validators/CApiInputValidator.php:855 +#: include/classes/validators/CApiInputValidator.php:859 msgid "invalid host group name" msgstr "ошибочное имя группы узлов сети" -#: include/classes/validators/CApiInputValidator.php:899 +#: include/classes/validators/CApiInputValidator.php:903 msgid "invalid host name" msgstr "ошибочное имя узла сети" -#: include/classes/validators/CApiInputValidator.php:1129 +#: include/classes/validators/CApiInputValidator.php:1162 msgid "invalid regular expression" msgstr "ошибочное регулярное выражение" @@ -18839,7 +18866,7 @@ msgstr "больше чем или равно" msgid "is less than or equals" msgstr "меньше чем или равно" -#: include/classes/validators/CApiInputValidator.php:1365 +#: include/classes/validators/CApiInputValidator.php:1398 msgid "is not enclosed in {} or is malformed" msgstr "не заключено в {} или ошибочно" @@ -18861,7 +18888,7 @@ msgid "key is empty" msgstr "ключ пустой" #: include/classes/graphdraw/CLineGraphDraw.php:1850 -#: include/classes/graphdraw/CPieGraphDraw.php:330 include/forms.inc.php:2022 +#: include/classes/graphdraw/CPieGraphDraw.php:330 include/forms.inc.php:2270 #: include/graphs.inc.php:82 include/maintenances.inc.php:115 #: include/views/js/configuration.graph.edit.js.php:52 msgid "last" @@ -18875,12 +18902,7 @@ msgstr "last() - Последнее (наиболее новое) значени msgid "left" msgstr "слева" -#: include/views/configuration.item.edit.php:1002 -#: include/views/configuration.item.massupdate.php:379 -#: include/views/configuration.item.prototype.edit.php:835 -#: include/views/configuration.item.prototype.massupdate.php:356 -#: include/views/js/common.item.edit.js.php:197 -#: include/views/js/configuration.item.massupdate.js.php:154 +#: include/forms.inc.php:1463 include/views/js/item.preprocessing.js.php:146 msgid "list of characters" msgstr "список символов" @@ -18934,20 +18956,19 @@ msgid "map" msgstr "карта сети" #: include/actions.inc.php:34 -#: include/views/configuration.host.discovery.edit.php:633 -#: include/views/js/configuration.host.discovery.edit.js.php:24 +#: include/views/configuration.host.discovery.edit.php:621 +#: include/views/js/configuration.host.discovery.edit.js.php:26 msgid "matches" msgstr "совпадает" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #: include/classes/graphdraw/CLineGraphDraw.php:1853 #: include/classes/graphdraw/CLineGraphDraw.php:1867 -#: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:80 -#: include/views/configuration.item.edit.php:1032 -#: include/views/configuration.item.prototype.edit.php:865 -#: include/views/js/common.item.edit.js.php:237 +#: include/classes/graphdraw/CPieGraphDraw.php:326 include/forms.inc.php:1497 +#: include/graphs.inc.php:80 #: include/views/js/configuration.graph.edit.js.php:51 #: include/views/js/configuration.graph.edit.js.php:59 +#: include/views/js/item.preprocessing.js.php:192 msgid "max" msgstr "макс" @@ -18955,28 +18976,24 @@ msgstr "макс" msgid "max() - Maximum value for period T" msgstr "max() - Максимальное значение за период Т" -#: include/classes/api/services/CItemGeneral.php:1851 +#: include/classes/api/services/CItemGeneral.php:1942 msgid "maximum dependent items count reached" msgstr "достигнуто максимальное количество зависимых элементов данных" -#: include/classes/api/services/CHostGeneral.php:1031 -#: include/classes/api/services/CItemGeneral.php:1766 -#: include/classes/api/services/CItemGeneral.php:1860 -#: include/classes/api/services/CItemGeneral.php:1980 -#: include/classes/import/CConfigurationImport.php:2565 -#: include/classes/import/CConfigurationImport.php:2626 +#: include/classes/api/services/CItemGeneral.php:1928 +#: include/classes/import/CConfigurationImport.php:2573 +#: include/classes/import/CConfigurationImport.php:2634 msgid "maximum number of dependency levels reached" msgstr "достигнуто максимальное количество уровней зависимостей" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #: include/classes/graphdraw/CLineGraphDraw.php:1851 #: include/classes/graphdraw/CLineGraphDraw.php:1864 -#: include/classes/graphdraw/CPieGraphDraw.php:322 include/graphs.inc.php:78 -#: include/views/configuration.item.edit.php:1031 -#: include/views/configuration.item.prototype.edit.php:864 -#: include/views/js/common.item.edit.js.php:234 +#: include/classes/graphdraw/CPieGraphDraw.php:322 include/forms.inc.php:1496 +#: include/graphs.inc.php:78 #: include/views/js/configuration.graph.edit.js.php:49 #: include/views/js/configuration.graph.edit.js.php:57 +#: include/views/js/item.preprocessing.js.php:189 msgid "min" msgstr "мин" @@ -18984,7 +19001,7 @@ msgstr "мин" msgid "min() - Minimum value for period T" msgstr "min() - Минимальное значение за период Т" -#: include/classes/api/services/CHost.php:1554 +#: include/classes/api/services/CHost.php:1590 #, c-format msgid "minimum length is %1$s characters" msgstr "минимальная длина %1$s символов" @@ -18999,7 +19016,7 @@ msgctxt "millisecond short" msgid "ms" msgstr "мс" -#: app/views/administration.authentication.edit.php:114 +#: app/views/administration.authentication.edit.php:122 msgid "must be a valid LDAP user" msgstr "должен быть действительным пользователем LDAP" @@ -19017,17 +19034,17 @@ msgstr "должен быть действительным пользовате msgid "must be between \"%1$s\" and \"%2$s\"" msgstr "должно быть между \"%1$s\" и \"%2$s\"" -#: include/classes/validators/CApiInputValidator.php:862 -#: include/classes/validators/CApiInputValidator.php:906 +#: include/classes/validators/CApiInputValidator.php:866 +#: include/classes/validators/CApiInputValidator.php:910 msgid "must contain at least one low-level discovery macro" msgstr "должно содержать по крайней мере один макрос низкоуровневого обнаружения" -#: include/views/configuration.host.discovery.edit.php:125 -#: include/views/configuration.host.discovery.edit.php:220 -#: include/views/configuration.item.edit.php:157 -#: include/views/configuration.item.edit.php:252 -#: include/views/configuration.item.prototype.edit.php:145 -#: include/views/configuration.item.prototype.edit.php:240 +#: include/views/configuration.host.discovery.edit.php:124 +#: include/views/configuration.host.discovery.edit.php:216 +#: include/views/configuration.item.edit.php:159 +#: include/views/configuration.item.edit.php:251 +#: include/views/configuration.item.prototype.edit.php:144 +#: include/views/configuration.item.prototype.edit.php:236 #: include/views/js/configuration.httpconf.edit.js.php:13 msgid "name" msgstr "название" @@ -19036,9 +19053,9 @@ msgstr "название" msgid "new" msgstr "новый" -#: disc_prototypes.php:1251 disc_prototypes.php:1275 hosts.php:1180 +#: disc_prototypes.php:1274 disc_prototypes.php:1298 hosts.php:1180 #: include/views/configuration.host.massupdate.php:83 -#: include/views/configuration.item.massupdate.php:591 templates.php:550 +#: include/views/configuration.item.massupdate.php:473 templates.php:550 msgctxt "new element in multiselect" msgid "new" msgstr "новый" @@ -19061,8 +19078,8 @@ msgstr "nodata() - Отсутствие полученных данных за msgid "none" msgstr "нет" -#: include/classes/api/services/CItemGeneral.php:2168 -#: include/classes/api/services/CItemGeneral.php:2192 +#: include/classes/api/services/CItemGeneral.php:2131 +#: include/classes/api/services/CItemGeneral.php:2155 msgid "nonempty key and value pair expected" msgstr "ожидался не пустая пара ключа и значения" @@ -19073,7 +19090,7 @@ msgstr "не в" #: app/controllers/CControllerDashboardView.php:134 #: hostinventoriesoverview.php:76 #: include/classes/pagefilter/CPageFilter.php:808 -#: include/classes/pagefilter/CPageFilter.php:875 include/forms.inc.php:1134 +#: include/classes/pagefilter/CPageFilter.php:875 include/forms.inc.php:1131 #: include/views/monitoring.screen.php:63 slides.php:187 msgid "not selected" msgstr "не выбрано" @@ -19082,13 +19099,7 @@ msgstr "не выбрано" msgid "now() - Number of seconds since the Epoch" msgstr "now() - Количество секунд начиная с Epoch" -#: include/views/configuration.item.edit.php:995 -#: include/views/configuration.item.massupdate.php:355 -#: include/views/configuration.item.prototype.edit.php:828 -#: include/views/configuration.item.prototype.massupdate.php:332 -#: include/views/js/common.item.edit.js.php:188 -#: include/views/js/configuration.item.massupdate.js.php:45 -#: include/views/js/configuration.item.massupdate.js.php:145 +#: include/forms.inc.php:1456 include/views/js/item.preprocessing.js.php:137 msgid "number" msgstr "число" @@ -19148,35 +19159,15 @@ msgstr "в" msgid "other" msgstr "другое" -#: include/views/configuration.item.edit.php:1017 -#: include/views/configuration.item.massupdate.php:368 -#: include/views/configuration.item.prototype.edit.php:850 -#: include/views/configuration.item.prototype.massupdate.php:345 -#: include/views/js/common.item.edit.js.php:58 -#: include/views/js/common.item.edit.js.php:218 -#: include/views/js/configuration.item.massupdate.js.php:46 +#: include/forms.inc.php:1482 include/views/js/item.preprocessing.js.php:26 +#: include/views/js/item.preprocessing.js.php:173 msgid "output" msgstr "вывод" -#: include/views/configuration.item.edit.php:1010 -#: include/views/configuration.item.massupdate.php:385 -#: include/views/configuration.item.prototype.edit.php:843 -#: include/views/configuration.item.prototype.massupdate.php:362 -#: include/views/js/common.item.edit.js.php:207 -#: include/views/js/configuration.item.massupdate.js.php:162 -msgid "path" -msgstr "путь" - -#: include/views/configuration.item.edit.php:1016 -#: include/views/configuration.item.edit.php:1037 -#: include/views/configuration.item.massupdate.php:390 -#: include/views/configuration.item.prototype.edit.php:849 -#: include/views/configuration.item.prototype.edit.php:870 -#: include/views/configuration.item.prototype.massupdate.php:367 -#: include/views/js/common.item.edit.js.php:55 -#: include/views/js/common.item.edit.js.php:215 -#: include/views/js/common.item.edit.js.php:244 -#: include/views/js/configuration.item.massupdate.js.php:169 +#: include/forms.inc.php:1481 include/forms.inc.php:1502 +#: include/views/js/item.preprocessing.js.php:23 +#: include/views/js/item.preprocessing.js.php:170 +#: include/views/js/item.preprocessing.js.php:199 msgid "pattern" msgstr "шаблон" @@ -19201,8 +19192,8 @@ msgstr "обновление каждые %1$s сек." msgid "regexp() - Regular expression V matching last value in period T (1 - match, 0 - no match)" msgstr "regexp() - Регулярное выражение V соответствует последнему значению за период Т (1 - соответствует, 0 - не соответствует)" -#: include/views/configuration.host.discovery.edit.php:656 -#: include/views/js/configuration.host.discovery.edit.js.php:29 +#: include/views/configuration.host.discovery.edit.php:644 +#: include/views/js/configuration.host.discovery.edit.js.php:31 msgid "regular expression" msgstr "регулярное выражение" @@ -19225,7 +19216,7 @@ msgstr "справа" msgid "root" msgstr "root" -#: include/classes/api/services/CItemGeneral.php:1760 +#: include/classes/api/services/CItemGeneral.php:1838 msgid "ruleid of dependent item and master item should match" msgstr "ruleid зависимого элемента данных и основного элемента данных должны совпадать" @@ -19234,18 +19225,16 @@ msgctxt "second short" msgid "s" msgstr "с" -#: include/forms.inc.php:2019 include/maintenances.inc.php:112 +#: include/forms.inc.php:2267 include/maintenances.inc.php:112 msgctxt "adjective" msgid "second" msgstr "второй" -#: include/classes/api/services/CItemGeneral.php:1282 +#: include/classes/api/services/CItemGeneral.php:1372 msgid "second parameter is expected" msgstr "ожидается второй параметр" -#: include/views/configuration.item.edit.php:1042 -#: include/views/configuration.item.prototype.edit.php:875 -#: include/views/js/common.item.edit.js.php:251 +#: include/forms.inc.php:1507 include/views/js/item.preprocessing.js.php:206 msgid "seconds" msgstr "" @@ -19257,19 +19246,19 @@ msgstr "выбрано" msgid "short description" msgstr "краткое описание" -#: include/classes/api/services/CHost.php:1561 -#: include/classes/api/services/CHost.php:1567 -#: include/classes/api/services/CHost.php:1576 -#: include/classes/api/services/CHost.php:1582 +#: include/classes/api/services/CHost.php:1597 +#: include/classes/api/services/CHost.php:1603 +#: include/classes/api/services/CHost.php:1612 +#: include/classes/api/services/CHost.php:1618 #: include/classes/api/services/CHttpTest.php:967 #: include/classes/api/services/CHttpTest.php:1076 #: include/classes/api/services/CItemGeneral.php:499 #: include/classes/api/services/CItemGeneral.php:537 -#: include/classes/api/services/CItemGeneral.php:1340 -#: include/classes/api/services/CItemGeneral.php:1363 -#: include/classes/api/services/CItemGeneral.php:1427 -#: include/classes/api/services/CItemGeneral.php:1455 -#: include/classes/api/services/CItemGeneral.php:2145 +#: include/classes/api/services/CItemGeneral.php:1430 +#: include/classes/api/services/CItemGeneral.php:1453 +#: include/classes/api/services/CItemGeneral.php:1517 +#: include/classes/api/services/CItemGeneral.php:1545 +#: include/classes/api/services/CItemGeneral.php:2108 #: include/classes/api/services/CMaintenance.php:468 #: include/classes/api/services/CMaintenance.php:637 #: include/classes/api/services/CProxy.php:661 @@ -19285,10 +19274,10 @@ msgstr "должно быть пустым" msgid "show icon mappings" msgstr "показать соответствия иконок" -#: include/views/configuration.item.edit.php:836 -#: include/views/configuration.item.massupdate.php:555 -#: include/views/configuration.item.prototype.edit.php:712 -#: include/views/configuration.item.prototype.massupdate.php:544 +#: include/views/configuration.item.edit.php:821 +#: include/views/configuration.item.massupdate.php:445 +#: include/views/configuration.item.prototype.edit.php:702 +#: include/views/configuration.item.prototype.massupdate.php:444 msgid "show value mappings" msgstr "показать преобразования значений" @@ -19346,8 +19335,10 @@ msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз" #: app/controllers/CControllerDashboardUpdate.php:135 #: app/controllers/CControllerDashboardUpdate.php:143 #: include/classes/api/services/CDashboard.php:385 +#: include/classes/api/services/CDiscoveryRule.php:1441 +#: include/classes/api/services/CDiscoveryRule.php:1449 #: include/classes/api/services/CHttpTest.php:750 -#: include/classes/validators/CApiInputValidator.php:683 +#: include/classes/validators/CApiInputValidator.php:687 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "параметр \"%1$s\" отсутствует" @@ -19358,7 +19349,7 @@ msgstr "параметр \"%1$s\" отсутствует" msgid "the tag \"%1$s\" is missing" msgstr "тег \"%1$s\" пропущен" -#: include/forms.inc.php:2020 include/maintenances.inc.php:113 +#: include/forms.inc.php:2268 include/maintenances.inc.php:113 msgid "third" msgstr "третий" @@ -19397,7 +19388,7 @@ msgstr "триггер со связями нельзя переместить msgid "type here to search" msgstr "начните печатать для поиска" -#: include/classes/validators/CApiInputValidator.php:1397 +#: include/classes/validators/CApiInputValidator.php:1430 msgid "unacceptible URL" msgstr "неприемлемый URL" @@ -19411,7 +19402,7 @@ msgstr "неожиданное завершение макроса" #: include/classes/api/services/CHttpTest.php:464 #: include/classes/api/services/CHttpTest.php:488 -#: include/classes/validators/CApiInputValidator.php:655 +#: include/classes/validators/CApiInputValidator.php:659 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "неожиданный параметр \"%1$s\"" @@ -19431,11 +19422,11 @@ msgstr "неожиданный текст \"%1$s\"" #: include/classes/api/services/CEvent.php:805 #: include/classes/api/services/CEvent.php:905 -#: include/classes/api/services/CHost.php:1516 -#: include/classes/api/services/CHost.php:1522 -#: include/classes/api/services/CItemGeneral.php:1208 -#: include/classes/api/services/CItemGeneral.php:1414 -#: include/classes/api/services/CItemGeneral.php:1440 +#: include/classes/api/services/CHost.php:1552 +#: include/classes/api/services/CHost.php:1558 +#: include/classes/api/services/CItemGeneral.php:1298 +#: include/classes/api/services/CItemGeneral.php:1504 +#: include/classes/api/services/CItemGeneral.php:1530 #: include/classes/api/services/CProxy.php:559 #: include/classes/api/services/CProxy.php:566 #: include/classes/api/services/CTriggerGeneral.php:574 @@ -19468,12 +19459,12 @@ msgstr "неподдерживаемый номер версии" #: include/views/administration.usergroups.edit.php:246 #: include/views/configuration.action.edit.php:370 #: include/views/configuration.correlation.edit.php:152 -#: include/views/configuration.host.discovery.edit.php:129 -#: include/views/configuration.host.discovery.edit.php:224 -#: include/views/configuration.item.edit.php:161 -#: include/views/configuration.item.edit.php:256 -#: include/views/configuration.item.prototype.edit.php:149 -#: include/views/configuration.item.prototype.edit.php:244 +#: include/views/configuration.host.discovery.edit.php:128 +#: include/views/configuration.host.discovery.edit.php:220 +#: include/views/configuration.item.edit.php:163 +#: include/views/configuration.item.edit.php:255 +#: include/views/configuration.item.prototype.edit.php:148 +#: include/views/configuration.item.prototype.edit.php:240 #: include/views/configuration.maintenance.edit.php:210 #: include/views/configuration.trigger.prototype.edit.php:500 #: include/views/configuration.trigger.prototype.massupdate.php:146 @@ -19482,55 +19473,61 @@ msgstr "неподдерживаемый номер версии" #: include/views/configuration.triggers.massupdate.php:129 #: include/views/hostmacros.php:85 #: include/views/js/administration.general.macros.edit.js.php:11 -#: include/views/js/common.item.edit.js.php:305 #: include/views/js/configuration.httpconf.edit.js.php:18 #: include/views/js/configuration.maintenance.edit.js.php:11 #: include/views/js/configuration.maintenance.edit.js.php:35 #: include/views/js/configuration.triggers.edit.js.php:9 #: include/views/js/configuration.triggers.list.js.php:11 #: include/views/js/hostmacros.js.php:11 +#: include/views/js/item.preprocessing.js.php:260 msgid "value" msgstr "значение" +#: include/classes/api/services/CDiscoveryRule.php:1320 +#, c-format +msgid "value \"%1$s\" already exists" +msgstr "" + #: include/classes/import/CConfigurationImport.php:808 #: include/classes/import/CConfigurationImport.php:846 -#: include/classes/import/CConfigurationImport.php:2461 -#: include/classes/import/CConfigurationImport.php:2575 -#: include/classes/import/CConfigurationImport.php:2620 +#: include/classes/import/CConfigurationImport.php:2469 +#: include/classes/import/CConfigurationImport.php:2583 +#: include/classes/import/CConfigurationImport.php:2628 #, c-format msgid "value \"%1$s\" not found" msgstr "значение \"%1$s\" не найдено" -#: include/classes/validators/CApiInputValidator.php:1219 -#: include/classes/validators/CApiInputValidator.php:1273 +#: include/classes/validators/CApiInputValidator.php:1252 +#: include/classes/validators/CApiInputValidator.php:1306 #, c-format msgid "value %1$s already exists" msgstr "значение %1$s уже существует" -#: include/classes/validators/CApiInputValidator.php:338 -#: include/classes/validators/CApiInputValidator.php:846 -#: include/classes/validators/CApiInputValidator.php:889 -#: include/classes/validators/CApiInputValidator.php:941 -#: include/classes/validators/CApiInputValidator.php:986 -#: include/classes/validators/CApiInputValidator.php:1021 -#: include/classes/validators/CApiInputValidator.php:1052 -#: include/classes/validators/CApiInputValidator.php:1086 -#: include/classes/validators/CApiInputValidator.php:1120 -#: include/classes/validators/CApiInputValidator.php:1360 -#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:342 +#: include/classes/validators/CApiInputValidator.php:850 +#: include/classes/validators/CApiInputValidator.php:893 +#: include/classes/validators/CApiInputValidator.php:945 +#: include/classes/validators/CApiInputValidator.php:990 +#: include/classes/validators/CApiInputValidator.php:1025 +#: include/classes/validators/CApiInputValidator.php:1054 +#: include/classes/validators/CApiInputValidator.php:1085 +#: include/classes/validators/CApiInputValidator.php:1119 +#: include/classes/validators/CApiInputValidator.php:1153 +#: include/classes/validators/CApiInputValidator.php:1393 +#: include/classes/validators/CApiInputValidator.php:1425 msgid "value is too long" msgstr "значение слишком длинное" #: include/classes/api/services/CHost.php:771 -#: include/classes/api/services/CHost.php:1678 -#: include/classes/api/services/CHost.php:1818 +#: include/classes/api/services/CHost.php:1714 +#: include/classes/api/services/CHost.php:1854 #: include/classes/api/services/CMapElement.php:75 #: include/classes/api/services/CMap.php:675 #: include/classes/api/services/CMap.php:681 #: include/classes/api/services/CMap.php:1129 #: include/classes/api/services/CMap.php:1135 -#: include/classes/validators/CApiInputValidator.php:332 -#: include/classes/validators/CApiInputValidator.php:476 +#: include/classes/validators/CApiInputValidator.php:336 +#: include/classes/validators/CApiInputValidator.php:480 #, c-format msgid "value must be one of %1$s" msgstr "значение должно быть одно из %1$s" |