diff options
| author | Continuous Integration <ci@zabbix.com> | 2021-10-06 11:37:54 +0300 |
|---|---|---|
| committer | Continuous Integration <ci@zabbix.com> | 2021-10-06 11:37:54 +0300 |
| commit | 174df48f0f7a4e73fa27dfc42144aabbe767b114 (patch) | |
| tree | 367a9db488366b1f667181a6cecaa7374013ef78 /ui/locale/ru/LC_MESSAGES | |
| parent | f94ab0c4f6860614b9a80ec38ebb7883d11762cc (diff) | |
.......... [ZBX-1357] automatic translation file sync for trunk
Diffstat (limited to 'ui/locale/ru/LC_MESSAGES')
| -rw-r--r-- | ui/locale/ru/LC_MESSAGES/frontend.po | 1895 |
1 files changed, 875 insertions, 1020 deletions
diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po index 0f5d13a1cb6..cf8d343a3df 100644 --- a/ui/locale/ru/LC_MESSAGES/frontend.po +++ b/ui/locale/ru/LC_MESSAGES/frontend.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-24 19:55+0300\n" +"POT-Creation-Date: 2021-10-06 11:31+0300\n" "PO-Revision-Date: 2021-09-20 09:03+0300\n" "Last-Translator: Yurii <jurijs.klopovskis@zabbix.com>\n" "Language-Team: Zabbix translation team\n" @@ -95,7 +95,7 @@ msgstr[0] "%1$d день" msgstr[1] "%1$d дня" msgstr[2] "%1$d дней" -#: jsLoader.php:323 +#: jsLoader.php:304 #, c-format msgctxt "screen reader" msgid "%1$d matches for %2$s found" @@ -187,7 +187,7 @@ msgstr[2] "%1$s сообщений" #: include/classes/widgets/CWidgetConfig.php:286 #: include/classes/widgets/CWidgetConfig.php:287 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631 -#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171 +#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152 #, c-format msgid "%1$s minute" msgid_plural "%1$s minutes" @@ -203,7 +203,7 @@ msgstr[0] "%1$s из %2$s элемента в состоянии проблем msgstr[1] "%1$s из %2$s элементов в состоянии проблемы" msgstr[2] "%1$s из %2$s элементов в состоянии проблемы" -#: jsLoader.php:324 +#: jsLoader.php:305 #, c-format msgctxt "screen reader" msgid "%1$s preselected, use down,up arrow keys and enter to select" @@ -239,7 +239,7 @@ msgstr[2] "%1$s попыток осталось" #: app/views/administration.user.edit.php:673 #: include/classes/widgets/CWidgetConfig.php:283 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638 -#: jsLoader.php:166 jsLoader.php:167 +#: jsLoader.php:147 jsLoader.php:148 #, c-format msgid "%1$s second" msgid_plural "%1$s seconds" @@ -247,7 +247,7 @@ msgstr[0] "%1$s секунда" msgstr[1] "%1$s секунды" msgstr[2] "%1$s секунд" -#: jsLoader.php:305 +#: jsLoader.php:286 #, c-format msgid "%1$s symbols remaining" msgstr "осталось %1$s символов" @@ -268,13 +268,13 @@ msgctxt "screen reader" msgid "%1$s, Severity, %2$s" msgstr "%1$s, Важность, %2$s" -#: jsLoader.php:318 +#: jsLoader.php:299 #, c-format msgctxt "screen reader" msgid "%1$s, read only" msgstr "%1$s, только чтение" -#: jsLoader.php:361 +#: jsLoader.php:342 #, c-format msgctxt "screen reader" msgid "%1$s, selected" @@ -406,7 +406,7 @@ msgstr "Доступ к API" msgid "API methods" msgstr "API методы" -#: app/controllers/CControllerAuditLogList.php:209 +#: app/controllers/CControllerAuditLogList.php:210 msgid "API token" msgstr "API токен" @@ -470,10 +470,6 @@ msgstr "API токены" msgid "Abscissa" msgstr "Ось абсцисс" -#: srv_status.php:149 -msgid "Acceptable SLA" -msgstr "" - #: include/func.inc.php:1511 msgid "Access denied" msgstr "Доступ запрещен" @@ -516,7 +512,7 @@ msgstr "" msgid "Ack" msgstr "Подтверждено" -#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328 +#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309 msgid "Acknowledge" msgstr "Подтвердить" @@ -537,7 +533,7 @@ msgstr "Подтвержденные события ПРОБЛЕМА" msgid "Acknowledged RESOLVED events" msgstr "Подтвержденные РЕШЕННЫЕ события" -#: app/controllers/CControllerAuditLogList.php:208 +#: app/controllers/CControllerAuditLogList.php:209 #: app/partials/administration.usergroup.tagfilters.html.php:29 #: app/partials/configuration.tags.tab.php:41 #: app/partials/configuration.valuemap.php:35 @@ -564,9 +560,9 @@ msgstr "Подтвержденные РЕШЕННЫЕ события" #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:84 #: app/views/popup.massupdate.trigger.php:98 -#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134 -#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270 -#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47 +#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151 +#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279 +#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51 #: app/views/reports.auditlog.list.php:71 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827 @@ -623,7 +619,7 @@ msgstr "Действие \"%1$s\" уже существует." msgid "Action \"%1$s\" no operations defined." msgstr "В действии \"%1$s\" нет заданных операций." -#: include/classes/api/services/CRole.php:742 +#: include/classes/api/services/CRole.php:743 #, c-format msgid "Action \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -632,7 +628,7 @@ msgstr "" msgid "Action added" msgstr "Действие добавлено" -#: include/classes/core/ZBase.php:532 +#: include/classes/core/ZBase.php:497 #, c-format msgid "Action class %1$s must extend %2$s class." msgstr "Класс действия %1$s должен расширять %2$s класс." @@ -683,8 +679,8 @@ msgstr "Действие обновлено" #: include/classes/screens/CScreenProblem.php:1163 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28 -#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144 -#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327 +#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125 +#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308 #: tr_events.php:182 msgid "Actions" msgstr "Действия" @@ -785,9 +781,9 @@ msgstr "Активно до" #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104 #: app/views/popup.scheduledreport.edit.php:43 #: app/views/popup.scheduledreport.subscription.php:133 -#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145 -#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294 -#: app/views/popup.service.edit.php:339 +#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158 +#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307 +#: app/views/popup.service.edit.php:385 #: app/views/popup.service.statusrule.edit.php:98 #: app/views/popup.service.time.edit.php:167 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147 @@ -857,7 +853,7 @@ msgstr "Активно до" #: include/views/monitoring.sysmap.edit.php:304 #: include/views/monitoring.sysmap.edit.php:325 #: include/views/monitoring.sysmap.edit.php:362 -#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191 +#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172 msgid "Add" msgstr "Добавить" @@ -865,11 +861,11 @@ msgstr "Добавить" msgid "Add (message type limit reached)" msgstr "Добавить (достигнуто максимальное количество типов сообщений)" -#: jsLoader.php:161 +#: jsLoader.php:142 msgid "Add a new widget" msgstr "Добавить новый виджет" -#: jsLoader.php:192 +#: jsLoader.php:173 msgid "Add child element" msgstr "Добавить элемент потомка" @@ -877,7 +873,7 @@ msgstr "Добавить элемент потомка" msgid "Add child service" msgstr "" -#: app/views/js/popup.service.edit.js.php:302 +#: app/views/js/popup.service.edit.js.php:493 msgid "Add child services" msgstr "" @@ -894,7 +890,7 @@ msgstr "Добавить узел сети" msgid "Add missing" msgstr "Добавить отсутствующее" -#: jsLoader.php:193 +#: jsLoader.php:174 msgid "Add multiple maps" msgstr "Добавить несколько карт" @@ -916,7 +912,7 @@ msgstr "Добавить новое замещение" msgid "Add page" msgstr "" -#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392 +#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373 msgid "Add parent services" msgstr "" @@ -968,12 +964,12 @@ msgstr "Добавить группу пользователей" msgid "Add widget" msgstr "Добавить виджет" -#: app/controllers/CControllerAuditLogList.php:353 +#: app/controllers/CControllerAuditLogList.php:354 #: app/controllers/CControllerPopupImportCompare.php:161 msgid "Added" msgstr "Добавлено" -#: jsLoader.php:316 +#: jsLoader.php:297 #, c-format msgctxt "screen reader" msgid "Added, %1$s" @@ -983,7 +979,7 @@ msgstr "Добавлено, %1$s" msgid "Additional rule" msgstr "" -#: app/views/popup.service.edit.php:154 +#: app/views/popup.service.edit.php:167 msgid "Additional rules" msgstr "" @@ -996,7 +992,7 @@ msgstr "Администратор" msgid "Administration" msgstr "Администрирование" -#: app/views/popup.service.edit.php:126 +#: app/views/popup.service.edit.php:143 msgid "Advanced configuration" msgstr "" @@ -1090,7 +1086,7 @@ msgstr "Выровнять элементы карты" #: app/views/reports.scheduledreport.list.php:56 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178 -#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384 +#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365 msgid "All" msgstr "Все" @@ -1108,7 +1104,7 @@ msgstr "Все группы" msgid "All hosts" msgstr "Все узлы сети" -#: jsLoader.php:272 +#: jsLoader.php:253 msgid "All links should have \"Name\" and \"URL\" specified" msgstr "У всех ссылок должны быть указаны \"Имя\" и \"URL\"" @@ -1126,7 +1122,7 @@ msgstr "Все проблемы" msgid "All problems if tag values match" msgstr "Все проблемы если значения тегов совпадают" -#: app/controllers/CControllerServiceListGeneral.php:121 +#: app/controllers/CControllerServiceListGeneral.php:145 msgid "All services" msgstr "" @@ -1239,15 +1235,15 @@ msgstr "Ошибка приложения." #: app/views/dashboard.page.properties.edit.php:64 #: app/views/dashboard.properties.edit.php:92 #: app/views/monitoring.dashboard.widget.edit.php:38 -#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47 +#: app/views/popup.maintenance.period.php:189 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298 #: include/classes/html/CTabFilter.php:96 #: include/views/js/monitoring.sysmaps.js.php:327 #: include/views/js/monitoring.sysmaps.js.php:480 #: include/views/js/monitoring.sysmaps.js.php:604 #: include/views/js/monitoring.sysmaps.js.php:709 -#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194 -#: jsLoader.php:307 +#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175 +#: jsLoader.php:288 msgid "Apply" msgstr "Применить" @@ -1265,7 +1261,7 @@ msgstr "Близится" msgid "Apr" msgstr "Апр." -#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224 +#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205 msgid "April" msgstr "Апрель" @@ -1293,7 +1289,7 @@ msgstr "Тип области" msgid "Arithmetic" msgstr "Арифметические" -#: include/classes/helpers/CServiceHelper.php:146 +#: include/classes/helpers/CServiceHelper.php:148 msgid "As is" msgstr "" @@ -1344,7 +1340,7 @@ msgstr "В (час:минута)" msgid "At least one UI element must be checked." msgstr "Необходимо выбрать по крайней мере один элемент интерфейса пользователей." -#: include/classes/api/services/CRole.php:471 +#: include/classes/api/services/CRole.php:469 #, c-format msgid "At least one UI element must be enabled for user role \"%1$s\"." msgstr "" @@ -1354,7 +1350,7 @@ msgid "At least one action is mandatory." msgstr "По крайней мере одно действие обязательно." #: include/classes/api/services/CUser.php:608 -#: include/classes/api/services/CUser.php:1286 +#: include/classes/api/services/CUser.php:1280 #, c-format msgid "At least one active user must exist with role \"%1$s\"." msgstr "Должен существовать, по крайней мере, один активный пользователь с ролью \"%1$s\"." @@ -1432,7 +1428,7 @@ msgstr "" msgid "Aug" msgstr "Авг" -#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228 +#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209 msgid "August" msgstr "Август" @@ -1445,7 +1441,7 @@ msgstr "Токен аутентификации" msgid "AuthN requests" msgstr "Запросы AuthN" -#: app/controllers/CControllerAuditLogList.php:210 +#: app/controllers/CControllerAuditLogList.php:211 #: app/views/administration.authentication.edit.php:324 #: app/views/administration.authentication.edit.php:334 #: app/views/administration.mediatype.edit.php:89 @@ -1462,7 +1458,7 @@ msgstr "Аутентификация" msgid "Authentication algorithm" msgstr "Алгоритм аутентификации" -#: include/classes/api/services/CUser.php:2047 +#: include/classes/api/services/CUser.php:2041 #, c-format msgid "Authentication failed: %1$s." msgstr "Ошибка при аутентификации: %1$s." @@ -1511,7 +1507,7 @@ msgstr "Авто" msgid "Auto-login" msgstr "Авто-вход" -#: include/classes/api/services/CUser.php:1012 +#: include/classes/api/services/CUser.php:1006 msgid "Auto-login and auto-logout options cannot be enabled together." msgstr "Опции авто-вход и авто-выход нельзя активировать вместе." @@ -1537,7 +1533,7 @@ msgstr "Автоматическое соответствие иконок" msgid "Automatic icon selection" msgstr "Автоматический выбор иконки" -#: app/controllers/CControllerAuditLogList.php:211 +#: app/controllers/CControllerAuditLogList.php:212 #: app/controllers/CControllerAutoregEdit.php:67 #: app/views/administration.autoreg.edit.php:29 #: app/views/administration.autoreg.edit.php:89 @@ -1589,7 +1585,7 @@ msgstr "Среднее количество ожидающих запросов msgid "Avoid easy-to-guess passwords" msgstr "" -#: include/classes/widgets/views/widget.svggraph.form.view.php:293 +#: include/classes/widgets/views/widget.svggraph.form.view.php:294 msgid "Axes" msgstr "Оси" @@ -1652,7 +1648,7 @@ msgstr "Битовые функции" msgid "Blocked" msgstr "Заблокирован" -#: include/classes/core/ZBase.php:361 +#: include/classes/core/ZBase.php:355 msgid "Blue" msgstr "Голубая" @@ -1706,11 +1702,11 @@ msgstr "Оба пароля должны совпадать." msgid "Bottom" msgstr "По нижнему краю" -#: jsLoader.php:264 +#: jsLoader.php:245 msgid "Bring forward" msgstr "Переместить вперёд" -#: jsLoader.php:263 +#: jsLoader.php:244 msgid "Bring to front" msgstr "На передний план" @@ -1736,7 +1732,7 @@ msgstr "CERT" #: app/views/hintbox.eventlist.php:116 #: app/views/monitoring.widget.problems.view.php:109 -#: include/classes/graph/CSvgGraph.php:1080 +#: include/classes/graph/CSvgGraph.php:1086 #: include/classes/screens/CScreenProblem.php:974 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376 msgid "CLOSING" @@ -1781,8 +1777,8 @@ msgstr "CRLF" msgid "CSV to JSON" msgstr "CSV в JSON" -#: include/classes/validators/CApiInputValidator.php:2514 -#: include/classes/validators/CNewValidator.php:338 +#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CNewValidator.php:310 msgid "CUID is expected" msgstr "" @@ -1791,7 +1787,7 @@ msgstr "" msgid "Calculated" msgstr "Вычисляемое" -#: jsLoader.php:220 +#: jsLoader.php:201 msgid "Calendar" msgstr "Календарь" @@ -1829,8 +1825,8 @@ msgstr "Callback" #: app/views/monitoring.dashboard.view.php:143 #: app/views/popup.import.compare.php:162 #: include/classes/html/CButtonCancel.php:25 -#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195 -#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380 +#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176 +#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361 msgid "Cancel" msgstr "Отмена" @@ -1860,7 +1856,7 @@ msgstr "Не удалось добавить действие" msgid "Cannot add correlation" msgstr "Не удалось добавить корреляцию" -#: jsLoader.php:145 +#: jsLoader.php:126 #, c-format msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added." msgstr "Не удалось добавить страницу панели: уже добавлено максимальное количество %1$d страниц панелей" @@ -1870,7 +1866,7 @@ msgstr "Не удалось добавить страницу панели: уж msgid "Cannot add dependency from a host to a template." msgstr "Не удалось добавить зависимость от узла сети к шаблону." -#: include/classes/api/services/CDiscoveryRule.php:889 +#: include/classes/api/services/CDiscoveryRule.php:885 #: include/triggers.inc.php:371 #, c-format msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"." @@ -1901,8 +1897,8 @@ msgid "Cannot add host prototype" msgstr "Не удалось добавить прототип узлов сети" #: app/controllers/CControllerImageCreate.php:41 -#: app/controllers/CControllerImageCreate.php:107 -#: app/controllers/CControllerImageCreate.php:131 +#: app/controllers/CControllerImageCreate.php:101 +#: app/controllers/CControllerImageCreate.php:132 msgid "Cannot add image" msgstr "Не удалось добавить изображение" @@ -1995,15 +1991,15 @@ msgstr "Не удалось добавить пользователя" msgid "Cannot add user group" msgstr "Не удалось добавить группу пользователей" -#: httpconf.php:228 +#: httpconf.php:200 msgid "Cannot add web scenario" msgstr "Не удалось добавить веб-сценарий" -#: jsLoader.php:146 +#: jsLoader.php:127 msgid "Cannot add widget: not enough free space on the dashboard." msgstr "Не удалось добавить виджет: не хватает свободного места на ПАНЕЛИ." -#: jsLoader.php:319 +#: jsLoader.php:300 msgctxt "screen reader" msgid "Cannot be removed" msgstr "" @@ -2023,33 +2019,29 @@ msgstr "Не удалось привязать к LDAP серверу." msgid "Cannot build expression tree: %1$s." msgstr "Не удалось построить дерево выражения: %1$s." -#: include/classes/api/services/CRole.php:773 +#: include/classes/api/services/CRole.php:774 msgid "Cannot change the user type of own role." msgstr "" -#: httpconf.php:219 httpconf.php:493 items.php:962 +#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038 msgid "Cannot clear history" msgstr "Не удалось очистить историю" -#: items.php:1070 -msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host" -msgstr "Не удалось очистить историю: по крайней мере один из выбранных элементов данных не принадлежит к какому либо узлу сети под наблюдением" - -#: include/classes/api/services/CDiscoveryRule.php:2514 +#: include/classes/api/services/CDiscoveryRule.php:2510 msgid "Cannot clone graph prototypes." msgstr "Не удалось клонировать прототипы графиков." -#: include/classes/api/services/CDiscoveryRule.php:2570 +#: include/classes/api/services/CDiscoveryRule.php:2566 msgid "Cannot clone host prototypes." msgstr "Не удалось клонировать прототипы узлов сети." -#: include/classes/api/services/CDiscoveryRule.php:2317 -#: include/classes/api/services/CDiscoveryRule.php:2373 -#: include/classes/api/services/CDiscoveryRule.php:2391 +#: include/classes/api/services/CDiscoveryRule.php:2313 +#: include/classes/api/services/CDiscoveryRule.php:2369 +#: include/classes/api/services/CDiscoveryRule.php:2387 msgid "Cannot clone item prototypes." msgstr "Не удалось клонировать прототипы элементов данных." -#: include/classes/api/services/CDiscoveryRule.php:802 +#: include/classes/api/services/CDiscoveryRule.php:798 msgid "Cannot clone trigger prototypes." msgstr "Не удалось клонировать прототипы триггеров." @@ -2077,7 +2069,7 @@ msgstr[0] "Не удалось скопировать график" msgstr[1] "Не удалось скопировать графики" msgstr[2] "Не удалось скопировать графики" -#: items.php:1054 +#: items.php:1022 msgid "Cannot copy item" msgid_plural "Cannot copy items" msgstr[0] "Не удалось скопировать элемент даных" @@ -2131,8 +2123,8 @@ msgstr "Не удалось создать соответствие иконок msgid "Cannot create scheduled report" msgstr "Не удалось создать регулярный отчет" -#: include/classes/api/services/CService.php:1803 -#: include/classes/api/services/CService.php:1827 +#: include/classes/api/services/CService.php:2324 +#: include/classes/api/services/CService.php:2348 #, c-format msgid "Cannot create service \"%1$s\": %2$s." msgstr "" @@ -2153,7 +2145,7 @@ msgstr[0] "Не удалось удалить API токен" msgstr[1] "Не удалось удалить API токены" msgstr[2] "Не удалось удалить API токены" -#: include/classes/api/services/CUser.php:1257 +#: include/classes/api/services/CUser.php:1251 #, c-format msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Невозможно удалить внутреннего пользователя Zabbix \"%1$s\", попробуйте отключить его." @@ -2245,11 +2237,11 @@ msgstr[2] "Не удалось удалить групп узлов сети т msgid "Cannot delete host prototypes" msgstr "Не удалось удалить прототипы узлов сети" -#: app/controllers/CControllerIconMapDelete.php:64 +#: app/controllers/CControllerIconMapDelete.php:65 msgid "Cannot delete icon map" msgstr "Не удалось удалить соответствие иконок" -#: app/controllers/CControllerImageDelete.php:69 +#: app/controllers/CControllerImageDelete.php:71 msgid "Cannot delete image" msgstr "Не удалось удалить изображение" @@ -2274,7 +2266,7 @@ msgstr "Не удалось удалить прототип элементов msgid "Cannot delete item prototypes" msgstr "Не удалось удалить прототипы элементов данных" -#: items.php:1126 +#: items.php:1048 msgid "Cannot delete items" msgstr "Не удалось удалить элементы данных" @@ -2334,7 +2326,7 @@ msgstr[0] "Не удалось удалить скрипт" msgstr[1] "Не удалось удалить скрипты" msgstr[2] "Не удалось удалить скрипты" -#: include/classes/api/services/CScript.php:999 +#: include/classes/api/services/CScript.php:857 #, c-format msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Не удалось удалить скрипты. Скрипт \"%1$s\" используется в операции действия \"%2$s\"." @@ -2351,8 +2343,8 @@ msgstr[0] "Не удалось удалить услугу" msgstr[1] "Не удалось удалить услугу" msgstr[2] "Не удалось удалить услугу" -#: include/classes/api/services/CService.php:464 -#: include/classes/api/services/CService.php:479 +#: include/classes/api/services/CService.php:485 +#: include/classes/api/services/CService.php:500 #, c-format msgid "Cannot delete service \"%1$s\": %2$s." msgstr "" @@ -2381,7 +2373,7 @@ msgstr "Не удалось удалить прототип элементов msgid "Cannot delete templated item." msgstr "Невозможно удалить элемент данных унаследованный из шаблона." -#: include/classes/api/services/CDiscoveryRule.php:585 +#: include/classes/api/services/CDiscoveryRule.php:581 msgid "Cannot delete templated items." msgstr "Невозможно удалить элементы данных унаследованные из шаблонов." @@ -2437,7 +2429,7 @@ msgstr[0] "Не удалось удалить роль пользователя" msgstr[1] "Не удалось удалить роли пользователей" msgstr[2] "Не удалось удалить роли пользователей" -#: httpconf.php:179 httpconf.php:502 +#: httpconf.php:179 httpconf.php:444 msgid "Cannot delete web scenario" msgstr "Не удалось удалить веб-сценарий" @@ -2477,7 +2469,7 @@ msgstr[0] "Не удалось деактивировать узел сети" msgstr[1] "Не удалось деактивировать узлы сети" msgstr[2] "Не удалось деактивировать узлы сети" -#: items.php:1014 +#: items.php:982 msgid "Cannot disable item" msgid_plural "Cannot disable items" msgstr[0] "Не удалось деактивировать элемент данных" @@ -2513,7 +2505,7 @@ msgstr[0] "Не удалось деактивировать триггер" msgstr[1] "Не удалось деактивировать триггеры" msgstr[2] "Не удалось деактивировать триггеры" -#: httpconf.php:446 +#: httpconf.php:418 msgid "Cannot disable web scenario" msgid_plural "Cannot disable web scenarios" msgstr[0] "Не удалось деактивировать веб-сценарий" @@ -2566,7 +2558,7 @@ msgstr[0] "Не удалось активировать узел сети" msgstr[1] "Не удалось активировать узлы сети" msgstr[2] "Не удалось активировать узлы сети" -#: items.php:1013 +#: items.php:981 msgid "Cannot enable item" msgid_plural "Cannot enable items" msgstr[0] "Не удалось активировать элемент данных" @@ -2602,7 +2594,7 @@ msgstr[0] "Не удалось активировать триггер" msgstr[1] "Не удалось активировать триггеры" msgstr[2] "Не удалось активировать триггеры" -#: httpconf.php:445 +#: httpconf.php:417 msgid "Cannot enable web scenario" msgid_plural "Cannot enable web scenarios" msgstr[0] "Не удалось активировать веб-сценарий" @@ -2617,7 +2609,7 @@ msgstr "Не удалось раскрыть выражение" msgid "Cannot execute script." msgstr "Не удалось выполнить скрипт." -#: jsLoader.php:275 +#: jsLoader.php:256 msgid "Cannot expand macros." msgstr "Не удалось раскрыть макросы." @@ -2651,8 +2643,8 @@ msgstr "Не удалось найти узел сети \"%1$s\" использ 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:2146 -#: include/classes/api/services/CDiscoveryRule.php:2350 +#: include/classes/api/services/CDiscoveryRule.php:2142 +#: include/classes/api/services/CDiscoveryRule.php:2346 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526 #: include/items.inc.php:701 #, c-format @@ -2750,24 +2742,20 @@ msgstr "Не удалось найти преобразование значен 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\"." -#: srv_status.php:179 -msgid "Cannot format tree. Check logic structure in service links." -msgstr "" - #: include/classes/api/services/CTemplate.php:971 msgid "Cannot have empty visible template name." msgstr "Видимое имя шаблона не может быть пустым." -#: include/classes/api/services/CRole.php:574 -#: include/classes/api/services/CRole.php:591 -#: include/classes/api/services/CRole.php:647 -#: include/classes/api/services/CRole.php:664 +#: include/classes/api/services/CRole.php:572 +#: include/classes/api/services/CRole.php:589 +#: include/classes/api/services/CRole.php:648 +#: include/classes/api/services/CRole.php:665 #, c-format msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"." msgstr "" -#: include/classes/api/services/CRole.php:553 -#: include/classes/api/services/CRole.php:626 +#: include/classes/api/services/CRole.php:551 +#: include/classes/api/services/CRole.php:627 #, c-format msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -2795,7 +2783,7 @@ msgid "Cannot link template." msgstr "Не удалось присоединить шаблон." #: app/controllers/CControllerModuleEdit.php:106 -#: include/classes/core/ZBase.php:700 +#: include/classes/core/ZBase.php:665 #, c-format msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." @@ -2803,7 +2791,7 @@ msgstr[0] "Не удалось загрузить модуль с: %1$s." msgstr[1] "Не удалось загрузить модули с: %1$s." msgstr[2] "Не удалось загрузить модули с: %1$s." -#: include/classes/api/services/CUser.php:1449 +#: include/classes/api/services/CUser.php:1443 msgid "Cannot log out." msgstr "" @@ -2828,17 +2816,17 @@ msgstr "Невозможно обновить массово видимое им msgid "Cannot pass duplicate template IDs for the linkage: %1$s." msgstr "Невозможно передать дубликаты ID шаблонов для соединения: %1$s." -#: include/classes/db/DB.php:929 +#: include/classes/db/DB.php:958 #, c-format msgid "Cannot perform delete statement on table \"%1$s\" without where condition." msgstr "Невозможно выполнить запрос удаления из таблицы \"%1$s\" без выражения where." -#: include/classes/db/DB.php:642 +#: include/classes/db/DB.php:671 #, c-format msgid "Cannot perform update statement on table \"%1$s\" without values." msgstr "Невозможно выполнить запрос обновления таблицы \"%1$s\" без значений." -#: include/classes/db/DB.php:655 +#: include/classes/db/DB.php:684 #, c-format msgid "Cannot perform update statement on table \"%1$s\" without where condition." msgstr "Невозможно выполнить запрос обновления таблицы \"%1$s\" без выражения where." @@ -2884,7 +2872,7 @@ msgstr "Не удалось сохранить виджет \"%1$s\"." msgid "Cannot send command, check connection with Zabbix server \"%1$s\"." msgstr "Не удалось отправить команду, проверьте соединение с Zabbix сервером \"%1$s\"." -#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146 +#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068 msgid "Cannot send request" msgstr "Не удалось отправить запрос" @@ -2924,12 +2912,12 @@ msgstr "Невозможно задать поля инвентарных дан msgid "Cannot set session cookie." msgstr "Не удалось установить cookie сессии." -#: include/classes/api/services/CService.php:815 +#: include/classes/api/services/CService.php:1324 #, c-format msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"." msgstr "" -#: jsLoader.php:283 +#: jsLoader.php:264 msgid "Cannot support notification audio for this device." msgstr "Поддержка аудио оповещений отсутствует для этого устройства." @@ -3015,11 +3003,6 @@ msgstr "Не удалось обновить \"%1$s\" у обнаруженно msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"." msgstr "Не удалось обновить \"%2$s\" у обнаруженного триггера \"%1$s\"." -#: include/classes/api/services/CImage.php:519 -#, c-format -msgid "Cannot update \"imagetype\" for image \"%1$s\"." -msgstr "Не удалось обновить \"imagetype\" для изображения \"%1$s\"." - #: app/controllers/CControllerTokenUpdate.php:47 #: app/controllers/CControllerTokenUpdate.php:122 msgid "Cannot update API token" @@ -3117,13 +3100,13 @@ msgstr[2] "Не удалось обновить прототипы узлов с msgid "Cannot update hosts" msgstr "Не удалось обновить узлы сети" -#: app/controllers/CControllerIconMapUpdate.php:77 +#: app/controllers/CControllerIconMapUpdate.php:73 msgid "Cannot update icon map" msgstr "Не удалось обновить соответствие иконок" #: app/controllers/CControllerImageUpdate.php:43 -#: app/controllers/CControllerImageUpdate.php:110 -#: app/controllers/CControllerImageUpdate.php:144 +#: app/controllers/CControllerImageUpdate.php:111 +#: app/controllers/CControllerImageUpdate.php:157 msgid "Cannot update image" msgstr "Не удалось обновить изображение" @@ -3183,7 +3166,7 @@ msgstr "Не удалось обновить прокси" msgid "Cannot update proxy for discovered host \"%1$s\"." msgstr "Не удалось обновить прокси для обнаруженного узла сети \"%1$s\"." -#: include/classes/api/services/CRole.php:756 +#: include/classes/api/services/CRole.php:757 #, c-format msgid "Cannot update readonly user role \"%1$s\"." msgstr "Не удалось обновить роль пользователя \"%1$s\" только на чтение." @@ -3203,17 +3186,17 @@ msgstr "Не удалось обновить регулярный отчет" msgid "Cannot update script" msgstr "Не удалось обновить скрипт" -#: include/classes/api/services/CScript.php:602 -#: include/classes/api/services/CScript.php:615 -#: include/classes/api/services/CScript.php:628 +#: include/classes/api/services/CScript.php:405 +#: include/classes/api/services/CScript.php:418 +#: include/classes/api/services/CScript.php:431 #, c-format msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "Не удалось обновить область использования скрипта. Скрипт \"%1$s\" используется в действии \"%2$s\"." -#: include/classes/api/services/CService.php:1740 -#: include/classes/api/services/CService.php:1802 -#: include/classes/api/services/CService.php:1826 -#: include/classes/api/services/CService.php:1861 +#: include/classes/api/services/CService.php:2261 +#: include/classes/api/services/CService.php:2323 +#: include/classes/api/services/CService.php:2347 +#: include/classes/api/services/CService.php:2382 #, c-format msgid "Cannot update service \"%1$s\": %2$s." msgstr "" @@ -3290,7 +3273,7 @@ msgstr[2] "Не удалось обновить группы пользоват msgid "Cannot update user role" msgstr "Не удалось обновить роль пользователя" -#: httpconf.php:224 +#: httpconf.php:196 msgid "Cannot update web scenario" msgstr "Не удалось обновить веб-сценарий" @@ -3506,7 +3489,7 @@ msgstr "Проверяется производительность UDP серв msgid "Checks should be unique." msgstr "Проверки должны быть уникальными." -#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317 +#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356 msgid "Child services" msgstr "" @@ -3527,7 +3510,7 @@ msgstr "Закольцованная ссылка в шаблонах: %1$s." msgid "Circular template linkage is not allowed." msgstr "Закольцованное соединение шаблонов не допускается." -#: include/classes/core/ZBase.php:526 +#: include/classes/core/ZBase.php:491 #, c-format msgid "Class %1$s not found for action %2$s." msgstr "Класс %1$s не найден для действия %2$s." @@ -3548,11 +3531,11 @@ msgstr "Очистить историю и динамику изменений" msgid "Clear when unlinking" msgstr "Очистить при отсоединении" -#: jsLoader.php:162 +#: jsLoader.php:143 msgid "Click and drag to desired size." msgstr "Нажмите и переместите до желаемого размера." -#: jsLoader.php:306 +#: jsLoader.php:287 msgid "Click to view or edit" msgstr "Нажмите для просмотра или изменения" @@ -3582,7 +3565,7 @@ msgstr "Часы" #: include/views/configuration.template.edit.php:237 #: include/views/configuration.trigger.prototype.edit.php:654 #: include/views/configuration.triggers.edit.php:647 -#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330 +#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311 msgid "Clone" msgstr "Клонировать" @@ -3593,8 +3576,8 @@ msgstr "Клонировать" #: include/views/js/monitoring.sysmaps.js.php:487 #: include/views/js/monitoring.sysmaps.js.php:611 #: include/views/js/monitoring.sysmaps.js.php:716 -#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206 -#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373 +#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187 +#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354 msgid "Close" msgstr "Закрыть" @@ -3624,8 +3607,8 @@ msgid "Close problems" msgstr "Закрытие проблем" #: include/classes/html/CCollapsibleUiWidget.php:55 -#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296 -#: jsLoader.php:301 +#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277 +#: jsLoader.php:282 msgid "Collapse" msgstr "Свернуть" @@ -3642,7 +3625,7 @@ msgstr "Свернуть боковую панель" msgid "Color" msgstr "" -#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277 +#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258 #, c-format msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)." msgstr "" @@ -3724,12 +3707,12 @@ 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:1813 +#: include/classes/api/services/CDiscoveryRule.php:1809 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1605 +#: include/classes/api/services/CDiscoveryRule.php:1601 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"." msgstr "Условие \"%2$s\" не используется в \"%3$s\" формуле замещением \"%1$s\"." @@ -3744,12 +3727,12 @@ 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:1812 +#: include/classes/api/services/CDiscoveryRule.php:1808 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" правила обнаружения \"%1$s\" не определено." -#: include/classes/api/services/CDiscoveryRule.php:1604 +#: include/classes/api/services/CDiscoveryRule.php:1600 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined." msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" замещением \"%1$s\" не задано." @@ -3765,7 +3748,7 @@ msgstr "Условия" #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275 #: include/classes/helpers/CMenuHelper.php:221 #: include/classes/helpers/CRoleHelper.php:283 -#: include/views/inventory.host.view.php:222 jsLoader.php:329 +#: include/views/inventory.host.view.php:222 jsLoader.php:310 msgid "Configuration" msgstr "Настройка" @@ -3828,7 +3811,7 @@ msgstr "Настройка узлов сети" msgid "Configuration of housekeeping" msgstr "Настройка очистки истории" -#: app/controllers/CControllerIconMapEdit.php:106 +#: app/controllers/CControllerIconMapEdit.php:98 #: app/controllers/CControllerIconMapList.php:75 msgid "Configuration of icon mapping" msgstr "Настройка соответствий иконок" @@ -4039,7 +4022,7 @@ msgstr "Контактная информация" #: app/partials/monitoring.host.filter.php:197 #: app/partials/monitoring.problem.filter.php:178 #: app/partials/monitoring.problem.filter.php:360 -#: app/views/popup.service.edit.php:89 +#: app/views/popup.service.edit.php:95 #: include/classes/helpers/CTagFilterFieldHelper.php:69 #: include/classes/helpers/CTagFilterFieldHelper.php:124 #: include/classes/widgets/CWidgetHelper.php:491 @@ -4099,7 +4082,7 @@ msgstr "Содержит" #: include/views/monitoring.overview.items.php:88 #: include/views/monitoring.overview.triggers.php:124 #: include/views/monitoring.sysmap.list.php:39 report2.php:175 -#: srv_status.php:173 tr_events.php:207 +#: tr_events.php:207 msgid "Content controls" msgstr "Управление содержимым" @@ -4138,8 +4121,8 @@ msgstr "Координаты" #: include/views/configuration.copy.elements.php:77 #: include/views/configuration.graph.list.php:238 #: include/views/configuration.item.list.php:307 -#: include/views/configuration.triggers.list.php:343 jsLoader.php:147 -#: jsLoader.php:173 jsLoader.php:269 +#: include/views/configuration.triggers.list.php:343 jsLoader.php:128 +#: jsLoader.php:154 jsLoader.php:250 msgid "Copy" msgstr "Копировать" @@ -4201,10 +4184,6 @@ msgstr "Правило корреляции" msgid "Correlation updated" msgstr "Корреляция обновлена" -#: include/classes/api/services/CImage.php:341 -msgid "Could not save image!" -msgstr "Не удалось сохранить изображение!" - #: app/controllers/CControllerPopupTriggerExpr.php:51 #: app/controllers/CControllerPopupTriggerExpr.php:667 #: app/controllers/CControllerPopupTriggerExpr.php:850 @@ -4272,11 +4251,11 @@ msgstr "Создать корреляцию" msgid "Create dashboard" msgstr "Создать панель" -#: jsLoader.php:334 +#: jsLoader.php:315 msgid "Create dependent discovery rule" msgstr "Создать зависимое правило обнаружения" -#: jsLoader.php:333 +#: jsLoader.php:314 msgid "Create dependent item" msgstr "Создать зависимый элемент данных" @@ -4393,7 +4372,7 @@ msgstr "Создать карту сети" msgid "Create media type" msgstr "Создать способ оповещения" -#: app/views/popup.import.php:130 jsLoader.php:331 +#: app/views/popup.import.php:130 jsLoader.php:312 msgid "Create new" msgstr "Создать новое" @@ -4417,7 +4396,7 @@ msgstr "" msgid "Create template" msgstr "Создать шаблон" -#: include/views/configuration.triggers.list.php:149 jsLoader.php:332 +#: include/views/configuration.triggers.list.php:149 jsLoader.php:313 msgid "Create trigger" msgstr "Создать триггер" @@ -4592,11 +4571,11 @@ msgstr "DNS имя" msgid "Daily" msgstr "Ежедневно" -#: include/classes/core/ZBase.php:362 +#: include/classes/core/ZBase.php:356 msgid "Dark" msgstr "Темная" -#: app/controllers/CControllerAuditLogList.php:213 +#: app/controllers/CControllerAuditLogList.php:214 #: app/controllers/CControllerDashboardPrint.php:71 #: app/controllers/CControllerDashboardView.php:138 #: app/partials/scheduledreport.formgrid.html.php:83 @@ -4617,8 +4596,8 @@ msgstr "Панель \"%1$s\" уже существует." msgid "Dashboard \"%1$s\" is used in report \"%2$s\"." msgstr "Панель \"%1$s\" используется в \"%2$s\" отчете." -#: app/controllers/CControllerDashboardUpdate.php:141 -#: app/controllers/CControllerTemplateDashboardUpdate.php:135 +#: app/controllers/CControllerDashboardUpdate.php:145 +#: app/controllers/CControllerTemplateDashboardUpdate.php:139 msgid "Dashboard created" msgstr "Панель создана" @@ -4642,9 +4621,9 @@ msgstr "Свойства панели" msgid "Dashboard sharing" msgstr "Общий доступ к панели" -#: app/controllers/CControllerDashboardShareUpdate.php:89 -#: app/controllers/CControllerDashboardUpdate.php:136 -#: app/controllers/CControllerTemplateDashboardUpdate.php:130 +#: app/controllers/CControllerDashboardShareUpdate.php:94 +#: app/controllers/CControllerDashboardUpdate.php:140 +#: app/controllers/CControllerTemplateDashboardUpdate.php:134 msgid "Dashboard updated" msgstr "Панель обновлена" @@ -4668,7 +4647,7 @@ msgstr "Панель с ID \"%1$s\" недоступна." #: include/html.inc.php:371 include/views/configuration.template.list.php:121 #: include/views/configuration.template.list.php:233 #: include/views/inventory.host.view.php:168 -#: include/views/inventory.host.view.php:172 jsLoader.php:335 +#: include/views/inventory.host.view.php:172 jsLoader.php:316 msgid "Dashboards" msgstr "Панели" @@ -4696,7 +4675,7 @@ msgstr "Обзор данных" #: include/classes/widgets/CWidgetHelper.php:1154 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34 -#: include/classes/widgets/views/widget.svggraph.form.view.php:290 +#: include/classes/widgets/views/widget.svggraph.form.view.php:291 msgid "Data set" msgstr "Набор данных" @@ -4838,7 +4817,7 @@ msgstr "День недели" msgid "Days" msgstr "Дни" -#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364 +#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345 msgid "Debug" msgstr "Отладка" @@ -4852,7 +4831,7 @@ msgstr "Режим отладки" msgid "Dec" msgstr "Дек." -#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232 +#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213 msgid "December" msgstr "Декабрь" @@ -4861,7 +4840,7 @@ msgstr "Декабрь" msgid "Decimal places" msgstr "Число десятичных знаков" -#: include/classes/helpers/CServiceHelper.php:148 +#: include/classes/helpers/CServiceHelper.php:150 msgid "Decrease by" msgstr "" @@ -4871,7 +4850,7 @@ msgstr "" #: include/views/inventory.host.view.php:79 #: include/views/js/monitoring.sysmaps.js.php:145 #: include/views/js/monitoring.sysmaps.js.php:263 -#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258 +#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239 msgid "Default" msgstr "По умолчанию" @@ -4988,8 +4967,8 @@ msgstr "Задерживается на" #: include/views/configuration.template.list.php:283 #: include/views/configuration.trigger.prototype.list.php:207 #: include/views/configuration.triggers.list.php:350 -#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148 -#: jsLoader.php:174 jsLoader.php:336 +#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129 +#: jsLoader.php:155 jsLoader.php:317 msgid "Delete" msgstr "Удалить" @@ -5018,7 +4997,7 @@ msgstr "Удалить текущее действие?" msgid "Delete current correlation?" msgstr "Удалить текущую корреляцию?" -#: jsLoader.php:337 +#: jsLoader.php:318 msgid "Delete dashboard?" msgstr "Удалить панель?" @@ -5062,7 +5041,7 @@ msgstr "Удалить прототип элементов данных?" msgid "Delete item?" msgstr "Удалить элемент данных?" -#: jsLoader.php:274 +#: jsLoader.php:255 msgid "Delete links between selected elements?" msgstr "Удалить связи между выбранными элементами?" @@ -5118,7 +5097,7 @@ msgstr "Удалить выбранные панели?" msgid "Delete selected discovery rules?" msgstr "Удалить выбранные правила обнаружения?" -#: jsLoader.php:261 +#: jsLoader.php:242 msgid "Delete selected elements?" msgstr "Удалить выбранные элементы?" @@ -5223,7 +5202,7 @@ msgstr "" msgid "Delete selected services?" msgstr "" -#: jsLoader.php:262 +#: jsLoader.php:243 msgid "Delete selected shapes?" msgstr "Удалить выбранные фигуры?" @@ -5267,7 +5246,7 @@ msgstr "Удалить триггер?" msgid "Delete web scenario?" msgstr "Удалить веб-сценарий?" -#: app/controllers/CControllerAuditLogList.php:356 +#: app/controllers/CControllerAuditLogList.php:357 msgid "Deleted" msgstr "" @@ -5330,7 +5309,7 @@ msgstr "Зависит от" msgid "Deployment status" msgstr "Состояние развертывания" -#: app/controllers/CControllerAuditLogList.php:284 +#: app/controllers/CControllerAuditLogList.php:285 #: app/partials/hostmacros.list.html.php:37 #: app/partials/massupdate.macros.tab.php:29 #: app/partials/scheduledreport.formgrid.html.php:195 @@ -5363,7 +5342,7 @@ msgid "Description" msgstr "Описание" #: app/views/administration.mediatype.list.php:82 -#: app/views/js/reports.auditlog.list.js.php:148 +#: app/views/js/reports.auditlog.list.js.php:152 #: app/views/reports.auditlog.list.php:97 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175 @@ -5659,7 +5638,7 @@ msgstr "Обнаружение файловых систем виртуальн msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON" msgstr "Обнаружение виртуальных машин VMware, <url> - URL службы VMware. Возвращает JSON" -#: app/controllers/CControllerAuditLogList.php:214 +#: app/controllers/CControllerAuditLogList.php:215 #: app/views/configuration.discovery.edit.php:137 #: app/views/monitoring.discovery.view.php:50 #: app/views/monitoring.widget.discovery.view.php:32 @@ -5667,12 +5646,12 @@ msgstr "Обнаружение виртуальных машин VMware, <url> - msgid "Discovery rule" msgstr "Правило обнаружения" -#: include/classes/api/services/CDiscoveryRule.php:64 +#: include/classes/api/services/CDiscoveryRule.php:60 #, 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:65 +#: include/classes/api/services/CDiscoveryRule.php:61 #, c-format msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"." msgstr "Правило обнаружения \"%1$s\" уже существует у \"%2$s\"." @@ -5685,7 +5664,7 @@ msgstr "Правило обнаружения \"%1$s\" уже существуе msgid "Discovery rule \"%1$s\" already exists." msgstr "Правило обнаружения \"%1$s\" уже существует." -#: include/classes/api/services/CDiscoveryRule.php:2165 +#: include/classes/api/services/CDiscoveryRule.php:2161 #, c-format msgid "Discovery rule \"%1$s\" cannot be copied without its master item." msgstr "Правило обнаружения \"%1$s\" нельзя скопировать без его мастер элемента данных." @@ -5777,10 +5756,11 @@ msgid "Display stacked graph" msgstr "Показать стэкируемый график" #: app/controllers/CControllerHintboxActionlist.php:93 -#: app/views/administration.queue.details.php:85 app/views/search.php:184 +#: app/views/administration.queue.details.php:85 +#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184 #: app/views/search.php:268 app/views/search.php:367 #: include/actions.inc.php:1724 include/actions.inc.php:1796 -#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376 +#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357 #, c-format msgid "Displaying %1$s of %2$s found" msgstr "Отображено %1$s из %2$s найденных" @@ -5790,7 +5770,7 @@ msgstr "Отображено %1$s из %2$s найденных" msgid "Displaying %1$s to %2$s of %3$s found" msgstr "Отображено с %1$s до %2$s из %3$s найденных" -#: include/classes/widgets/views/widget.svggraph.form.view.php:291 +#: include/classes/widgets/views/widget.svggraph.form.view.php:292 msgid "Displaying options" msgstr "Опции отображения" @@ -5812,7 +5792,7 @@ msgstr "Не хранить историю" msgid "Do not keep trends" msgstr "Не хранить динамику изменений" -#: jsLoader.php:214 jsLoader.php:338 +#: jsLoader.php:195 jsLoader.php:319 msgid "Do you wish to replace the conditional expression?" msgstr "Вы хотите заменить условие выражения?" @@ -5868,7 +5848,7 @@ msgctxt "discovery status" msgid "Down" msgstr "Недоступен" -#: jsLoader.php:188 jsLoader.php:202 +#: jsLoader.php:169 jsLoader.php:183 msgid "Download image" msgstr "Загрузить изображение" @@ -5876,7 +5856,7 @@ msgstr "Загрузить изображение" msgid "Download the configuration file" msgstr "Загрузить конфигурационный файл" -#: app/partials/service.time.row.php:34 +#: app/views/js/popup.service.edit.js.php:227 #: app/views/popup.service.time.edit.php:47 #: include/classes/screens/CScreenDiscovery.php:120 msgid "Downtime" @@ -5975,7 +5955,7 @@ msgstr "Динамический элемент" msgid "Dynamic items" msgstr "Динамические элементы данных" -#: jsLoader.php:273 +#: jsLoader.php:254 msgid "Each URL should have a unique name. Please make sure there is only one URL named" msgstr "У каждого URL должно быть уникальное имя. Пожалуйста, удостоверьтесь, что есть только один URL с этим именем" @@ -5984,11 +5964,11 @@ msgid "Each item" msgstr "Каждый элемент данных" #: app/partials/monitoring.service.list.edit.php:127 -#: app/partials/service.statusrule.row.php:38 -#: app/partials/service.time.row.php:59 #: app/views/administration.user.edit.php:357 #: app/views/js/administration.mediatype.edit.js.php:50 #: app/views/js/configuration.discovery.edit.js.php:33 +#: app/views/js/popup.service.edit.js.php:191 +#: app/views/js/popup.service.edit.js.php:215 #: app/views/monitoring.service.list.edit.php:145 #: app/views/monitoring.service.list.php:114 #: include/views/configuration.action.edit.php:249 @@ -6002,8 +5982,8 @@ msgstr "Каждый элемент данных" #: include/views/configuration.triggers.edit.php:350 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118 #: include/views/js/monitoring.sysmaps.js.php:836 -#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175 -#: jsLoader.php:196 +#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156 +#: jsLoader.php:177 msgid "Edit" msgstr "Изменить" @@ -6019,11 +5999,11 @@ msgstr "Изменить карту сети" msgid "Edit operation" msgstr "Изменить операцию" -#: jsLoader.php:197 +#: jsLoader.php:178 msgid "Edit tree element" msgstr "Изменит элемент дерева" -#: jsLoader.php:339 +#: jsLoader.php:320 msgid "Edit trigger" msgstr "Изменить триггер" @@ -6092,12 +6072,12 @@ msgstr "Пустой ID корреляции." msgid "Empty filter condition formula ID for action \"%1$s\"." msgstr "Пустой ID формулы условия фильтра для действия \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1840 +#: include/classes/api/services/CDiscoveryRule.php:1836 #, c-format msgid "Empty filter condition formula ID for discovery rule \"%1$s\"." msgstr "Пустой ID формулы условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1832 +#: include/classes/api/services/CDiscoveryRule.php:1828 #, c-format msgid "Empty filter condition macro for discovery rule \"%1$s\"." msgstr "Пустой макрос условия фильтра для правила обнаружения \"%1$s\"." @@ -6124,14 +6104,10 @@ msgstr "Пустой тип условия фильтрации для дейс #: include/classes/api/services/CHost.php:1850 #: include/classes/api/services/CHost.php:2075 #: include/classes/api/services/CHostPrototype.php:1109 -#: include/classes/api/services/CImage.php:448 -#: include/classes/api/services/CImage.php:501 #: include/classes/api/services/CMaintenance.php:542 #: include/classes/api/services/CMap.php:563 #: include/classes/api/services/CMap.php:589 #: include/classes/api/services/CMap.php:1034 -#: include/classes/api/services/CMediatype.php:182 -#: include/classes/api/services/CMediatype.php:448 #: include/classes/api/services/CTemplate.php:707 #: include/classes/api/services/CTrigger.php:798 msgid "Empty input parameter." @@ -6141,14 +6117,6 @@ msgstr "Пустой входной параметр." msgid "Empty map ID." msgstr "Пустой ID карты сети." -#: include/classes/api/services/CMediatype.php:454 -msgid "Empty media type ID." -msgstr "Пустой ID типа оповещений." - -#: include/classes/api/services/CImage.php:360 -msgid "Empty parameters" -msgstr "Пустые параметры" - #: app/views/administration.mediatype.list.php:167 #: app/views/administration.module.list.php:123 #: app/views/administration.token.list.php:200 @@ -6384,7 +6352,7 @@ msgstr "Запись с UUID \"%1$s\" уже существует." #: app/partials/monitoring.host.filter.php:196 #: app/partials/monitoring.problem.filter.php:177 #: app/partials/monitoring.problem.filter.php:359 -#: app/views/popup.service.edit.php:88 +#: app/views/popup.service.edit.php:94 #: include/classes/helpers/CTagFilterFieldHelper.php:68 #: include/classes/helpers/CTagFilterFieldHelper.php:123 #: include/classes/widgets/CWidgetHelper.php:490 @@ -6403,12 +6371,12 @@ msgstr "Равно" msgid "Error" msgstr "Ошибка" -#: include/db.inc.php:509 +#: include/db.inc.php:518 #, c-format msgid "Error in search request for table \"%1$s\"." msgstr "Ошибка в запросе поиска в таблицу \"%1$s\"." -#: include/func.inc.php:1642 jsLoader.php:216 +#: include/func.inc.php:1642 jsLoader.php:197 msgid "Error message" msgstr "Сообщение об ошибке" @@ -6435,7 +6403,7 @@ msgstr "ID события" msgid "Event acknowledged" msgstr "Событие подтверждено" -#: app/controllers/CControllerAuditLogList.php:212 +#: app/controllers/CControllerAuditLogList.php:213 #: app/views/configuration.correlation.list.php:31 #: include/classes/helpers/CMenuHelper.php:207 #: include/classes/helpers/CRoleHelper.php:368 @@ -6528,15 +6496,10 @@ msgstr "Исключить" msgid "Exclude host groups" msgstr "Исключить группы узлов сети" -#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207 +#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188 msgid "Execute" msgstr "Выполнить" -#: include/classes/api/services/CImage.php:224 -#, c-format -msgid "Execute SQL error [%1$s] in [%2$s]." -msgstr "Ошибка выполнения SQL [%1$s] в [%2$s]." - #: include/classes/items/CHelpItems.php:409 msgid "Execute WMI query and return the JSON document with all selected objects" msgstr "Выполнение запроса WMI и получение JSON документа со всеми выбранными объектами" @@ -6574,7 +6537,7 @@ msgstr "Выполнено" msgid "Executed script" msgstr "Выполняемый скрипт" -#: jsLoader.php:208 +#: jsLoader.php:189 msgid "Execution confirmation" msgstr "Подтверждение выполнения" @@ -6590,8 +6553,8 @@ msgid "Exists" msgstr "Существует" #: include/classes/html/CCollapsibleUiWidget.php:60 -#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297 -#: jsLoader.php:300 +#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278 +#: jsLoader.php:281 msgid "Expand" msgstr "Раскрыть" @@ -6712,7 +6675,7 @@ msgstr "Выражения" msgid "External check" msgstr "Внешняя проверка" -#: jsLoader.php:244 +#: jsLoader.php:225 msgctxt "Friday short" msgid "F" msgstr "Пт" @@ -6739,8 +6702,8 @@ msgstr "Неудачно" msgid "Failed login" msgstr "" -#: app/controllers/CControllerDashboardUpdate.php:142 -#: app/controllers/CControllerTemplateDashboardUpdate.php:136 +#: app/controllers/CControllerDashboardUpdate.php:146 +#: app/controllers/CControllerTemplateDashboardUpdate.php:140 #: app/views/js/configuration.dashboard.edit.js.php:155 #: app/views/js/monitoring.dashboard.view.js.php:219 msgid "Failed to create dashboard" @@ -6751,26 +6714,26 @@ msgstr "Ошибка при создании панели" msgid "Failed to parse URL." msgstr "Ошибка при разборе URL." -#: jsLoader.php:149 +#: jsLoader.php:130 msgid "Failed to paste dashboard page." msgstr "Ошибка при вставке страницы панели." -#: jsLoader.php:150 +#: jsLoader.php:131 msgid "Failed to paste widget." msgstr "Ошибка при вставке виджета." -#: app/controllers/CControllerDashboardUpdate.php:137 -#: app/controllers/CControllerTemplateDashboardUpdate.php:131 +#: app/controllers/CControllerDashboardUpdate.php:141 +#: app/controllers/CControllerTemplateDashboardUpdate.php:135 #: app/views/js/configuration.dashboard.edit.js.php:156 #: app/views/js/monitoring.dashboard.view.js.php:220 msgid "Failed to update dashboard" msgstr "Ошибка при обновлении панели" -#: jsLoader.php:151 +#: jsLoader.php:132 msgid "Failed to update dashboard page properties." msgstr "Ошибка при обновлении свойств страницы панели." -#: jsLoader.php:152 +#: jsLoader.php:133 msgid "Failed to update dashboard properties." msgstr "Ошибка при обновлении свойств панели." @@ -6778,7 +6741,7 @@ msgstr "Ошибка при обновлении свойств панели." msgid "Failed to update template." msgstr "Ошибка при обновлении шаблона." -#: jsLoader.php:153 +#: jsLoader.php:134 msgid "Failed to update widget properties." msgstr "Ошибка при обновлении свойств виджета." @@ -6802,7 +6765,7 @@ msgstr "" msgid "Feb" msgstr "Фев." -#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222 +#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203 msgid "February" msgstr "Февраль" @@ -6827,7 +6790,7 @@ msgstr "Поле \"%1$s\" не может быть NULL." #: include/classes/api/services/CHostGroup.php:1003 #: include/classes/api/services/CHost.php:892 #: include/classes/api/services/CTemplate.php:950 -#: include/classes/validators/CNewValidator.php:262 +#: include/classes/validators/CNewValidator.php:86 #: include/validate.inc.php:286 #, c-format msgid "Field \"%1$s\" is mandatory." @@ -6838,13 +6801,6 @@ msgstr "Поле \"%1$s\" обязательно." msgid "Field \"%1$s\" is missing a value for map \"%2$s\"." msgstr "В поле \"%1$s\" пропущено значение у карты сети \"%2$s\"." -#: include/classes/api/services/CMediatype.php:204 -#: include/classes/api/services/CMediatype.php:546 -#: include/classes/api/services/CMediatype.php:1205 -#, c-format -msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"." -msgstr "В поле \"%1$s\" пропущено значение типа оповещений \"%2$s\"." - #: include/validate.inc.php:175 include/validate.inc.php:183 #: include/validate.inc.php:189 include/validate.inc.php:193 #: include/validate.inc.php:213 include/validate.inc.php:221 @@ -6863,11 +6819,6 @@ msgstr "Поле \"%1$s\" не целое число." msgid "Field \"%1$s\" is not string." msgstr "Поле \"%1$s\" не строка." -#: include/classes/api/services/CMediatype.php:1199 -#, c-format -msgid "Field \"%1$s\" is required for media type \"%2$s\"." -msgstr "Поле \"%1$s\" обязательно у типа оповещений \"%2$s\"." - #: include/validate.inc.php:298 #, c-format msgid "Field \"%1$s\" must be missing." @@ -6882,10 +6833,6 @@ msgstr "Поле \"host\" является обязательным." msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256" msgstr "" -#: include/classes/api/services/CImage.php:570 -msgid "File format is unsupported." -msgstr "Формат файла не поддерживается." - #: include/classes/import/readers/CYamlImportReader.php:52 msgid "File is empty" msgstr "Файл пустой" @@ -6950,7 +6897,8 @@ msgstr "Заполнение" #: app/views/monitoring.latest.view.php:54 #: app/views/monitoring.service.list.edit.php:72 #: app/views/monitoring.service.list.php:68 -#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85 +#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328 +#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85 #: app/views/reports.scheduledreport.list.php:48 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394 #: include/classes/widgets/forms/CWidgetFormMap.php:56 @@ -6975,7 +6923,7 @@ msgstr "Фильтр" msgid "Filter properties" msgstr "Свойства фильтра" -#: app/controllers/CControllerServiceListGeneral.php:157 +#: app/controllers/CControllerServiceListGeneral.php:181 msgid "Filter results" msgstr "" @@ -7027,7 +6975,7 @@ msgstr "Вписать в карту сети" msgid "Fixed" msgstr "Фиксированное" -#: include/classes/helpers/CServiceHelper.php:150 +#: include/classes/helpers/CServiceHelper.php:152 msgid "Fixed status" msgstr "" @@ -7078,12 +7026,12 @@ msgstr "Формула" msgid "Formula missing for action \"%1$s\"." msgstr "Отсутствует формула у \"%1$s\" действия." -#: include/classes/api/services/CDiscoveryRule.php:1810 +#: include/classes/api/services/CDiscoveryRule.php:1806 #, c-format msgid "Formula missing for discovery rule \"%1$s\"." msgstr "Отсутствует формула у \"%1$s\" правила обнаружения." -#: include/classes/api/services/CDiscoveryRule.php:1601 +#: include/classes/api/services/CDiscoveryRule.php:1597 #, c-format msgid "Formula missing for override \"%1$s\"." msgstr "Отсутствует формула у \"%1$s\" замещения." @@ -7096,7 +7044,7 @@ msgstr "Французский (fr_FR)" msgid "Fri" msgstr "Пт" -#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237 +#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218 msgid "Friday" msgstr "Пятница" @@ -7207,7 +7155,7 @@ msgstr "Получить значение с узла сети" msgid "Given expression is not a macro" msgstr "Заданное выражение не является макросом" -#: include/classes/api/services/CIconMap.php:359 +#: include/classes/api/services/CIconMap.php:354 #, c-format msgid "Global regular expression \"%1$s\" does not exist." msgstr "Глобальное регулярное выражение \"%1$s\" не существует." @@ -7221,7 +7169,7 @@ msgstr "Глобальное значение" msgid "Go back to %1$s" msgstr "Вернуться к %1$s" -#: jsLoader.php:344 +#: jsLoader.php:325 msgid "Go to" msgstr "Перейти к" @@ -7259,7 +7207,7 @@ msgstr "Перейти на страницу %1$s, текущую страниц msgid "Go to previous page, %1$s" msgstr "Перейти на пред. страницу, %1$s" -#: include/httptest.inc.php:410 +#: include/httptest.inc.php:414 msgid "Google Chrome" msgstr "Google Chrome" @@ -7267,7 +7215,7 @@ msgstr "Google Chrome" msgid "Gradient line" msgstr "Градиентная линия" -#: app/controllers/CControllerAuditLogList.php:215 +#: app/controllers/CControllerAuditLogList.php:216 #: app/partials/monitoring.latest.view.html.php:154 #: app/views/monitoring.charts.view.php:56 #: include/classes/macros/CMacrosResolverGeneral.php:1044 @@ -7328,7 +7276,7 @@ msgstr[2] "Графики скопированы" msgid "Graph deleted" msgstr "График удален" -#: app/controllers/CControllerAuditLogList.php:216 +#: app/controllers/CControllerAuditLogList.php:217 #: app/views/popup.lldoperation.php:53 #: include/classes/widgets/CWidgetConfig.php:52 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32 @@ -7432,7 +7380,7 @@ msgstr "График с именем \"%1$s\" уже существует в г #: include/views/inventory.host.view.php:158 #: include/views/inventory.host.view.php:166 #: include/views/inventory.host.view.php:194 -#: include/views/inventory.host.view.php:217 jsLoader.php:345 +#: include/views/inventory.host.view.php:217 jsLoader.php:326 msgid "Graphs" msgstr "Графики" @@ -7633,11 +7581,11 @@ msgstr "Помощь" msgid "Hexadecimal to decimal" msgstr "Шестнадцатеричное в десятичное" -#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251 +#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232 msgid "Hidden" msgstr "Скрыта" -#: jsLoader.php:365 +#: jsLoader.php:346 msgid "Hide debug" msgstr "Скрыть отладку" @@ -7664,11 +7612,11 @@ msgstr "Иерархия" msgid "High" msgstr "Высокая" -#: include/classes/core/ZBase.php:364 +#: include/classes/core/ZBase.php:358 msgid "High-contrast dark" msgstr "Высококонтрастная тёмная" -#: include/classes/core/ZBase.php:363 +#: include/classes/core/ZBase.php:357 msgid "High-contrast light" msgstr "Высококонтрастная светлая" @@ -7689,7 +7637,7 @@ msgstr "Подсвечивать всю строку" #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89 #: include/views/configuration.item.prototype.list.php:62 items.php:261 -#: jsLoader.php:346 +#: jsLoader.php:327 msgid "History" msgstr "История" @@ -7697,11 +7645,15 @@ msgstr "История" msgid "History and trends compression" msgstr "Сжатие истории и динамики изменений" -#: items.php:959 items.php:1067 +#: include/classes/api/services/CHistory.php:353 msgid "History cleanup is not supported if compression is enabled" msgstr "При включенном сжатии очистка истории не поддерживается " -#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116 +#: app/controllers/CControllerAuditLogList.php:198 +msgid "History clear" +msgstr "" + +#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038 msgid "History cleared" msgstr "История очищена" @@ -7744,7 +7696,7 @@ msgstr "Горизонтальный" msgid "Horizontal align" msgstr "Выравнивание по горизонтали" -#: app/controllers/CControllerAuditLogList.php:217 +#: app/controllers/CControllerAuditLogList.php:218 #: app/partials/monitoring.latest.view.html.php:40 #: app/partials/popup.operations.php:175 #: app/views/administration.queue.details.php:47 @@ -7773,7 +7725,7 @@ msgstr "Выравнивание по горизонтали" #: include/views/inventory.host.view.php:214 #: include/views/js/monitoring.sysmaps.js.php:92 #: include/views/js/monitoring.sysmaps.js.php:161 -#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347 +#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328 #: report2.php:507 msgid "Host" msgid_plural "Hosts" @@ -7850,7 +7802,7 @@ msgstr[0] "Узел сети активирован" msgstr[1] "Узлы сети активированы" msgstr[2] "Узлы сети активированы" -#: app/controllers/CControllerAuditLogList.php:218 +#: app/controllers/CControllerAuditLogList.php:219 #: app/partials/administration.usergroup.grouprights.html.php:29 #: app/partials/administration.usergroup.tagfilters.html.php:29 #: app/partials/popup.operations.php:183 @@ -7864,7 +7816,7 @@ msgstr[2] "Узлы сети активированы" #: include/views/configuration.hostgroups.edit.php:51 #: include/views/js/monitoring.sysmaps.js.php:95 #: include/views/js/monitoring.sysmaps.js.php:102 -#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256 +#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237 #: report2.php:398 msgid "Host group" msgstr "Группа узлов сети" @@ -7893,7 +7845,7 @@ msgid "Host group label type" msgstr "Тип подписи к группе узлов сети" #: include/classes/api/services/CDashboardGeneral.php:555 -#: include/classes/api/services/CScript.php:937 +#: include/classes/api/services/CScript.php:800 #: include/classes/api/services/CSettings.php:236 #: include/classes/api/services/CUserGroup.php:455 #, c-format @@ -7986,7 +7938,7 @@ msgstr "Имя узла сети" msgid "Host networks" msgstr "Сети узла сети" -#: app/controllers/CControllerAuditLogList.php:219 +#: app/controllers/CControllerAuditLogList.php:220 #: app/views/popup.lldoperation.php:54 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168 msgid "Host prototype" @@ -8148,7 +8100,7 @@ msgstr "Узлы сети обновлены" msgid "Hours" msgstr "Часы" -#: app/controllers/CControllerAuditLogList.php:220 +#: app/controllers/CControllerAuditLogList.php:221 #: app/views/administration.housekeeping.edit.php:29 #: app/views/administration.housekeeping.edit.php:184 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884 @@ -8270,12 +8222,12 @@ msgstr "Подсветка иконок" msgid "Icon map" msgstr "Соответствие иконок" -#: include/classes/api/services/CIconMap.php:318 +#: include/classes/api/services/CIconMap.php:311 #, c-format msgid "Icon map \"%1$s\" already exists." msgstr "Соответствие иконок \"%1$s\" уже существует." -#: include/classes/api/services/CIconMap.php:540 +#: include/classes/api/services/CIconMap.php:545 #, c-format msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"." msgstr "Соответствие иконок \"%1$s\" не может быть удалено. Используется в карте сети \"%2$s\"." @@ -8288,18 +8240,18 @@ msgstr "Соответствие иконок создано" msgid "Icon map deleted" msgstr "Соответствие иконок удалено" -#: app/controllers/CControllerIconMapUpdate.php:65 +#: app/controllers/CControllerIconMapUpdate.php:60 msgid "Icon map updated" msgstr "Соответствие иконок обновлено" -#: app/controllers/CControllerAuditLogList.php:221 +#: app/controllers/CControllerAuditLogList.php:222 #: app/views/administration.iconmap.edit.php:29 #: app/views/administration.iconmap.list.php:27 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887 msgid "Icon mapping" msgstr "Соответствия иконок" -#: include/classes/api/services/CIconMap.php:400 +#: include/classes/api/services/CIconMap.php:397 #, c-format msgid "Icon with ID \"%1$s\" is not available." msgstr "Иконка с ID \"%1$s\" недоступна." @@ -8402,23 +8354,20 @@ msgstr "Если вы считаете это сообщение ошибкой, msgid "Iframe sandboxing exceptions" msgstr "Исключения для атрибута sandbox в iframe" -#: include/classes/helpers/CServiceHelper.php:149 +#: include/classes/helpers/CServiceHelper.php:151 msgid "Ignore this service" msgstr "" -#: app/controllers/CControllerAuditLogList.php:222 +#: app/controllers/CControllerAuditLogList.php:223 #: app/views/administration.image.edit.php:60 #: app/views/administration.image.edit.php:66 image.php:26 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96 -#: jsLoader.php:257 +#: jsLoader.php:238 msgid "Image" msgstr "Изображение" -#: include/classes/api/services/CImage.php:468 -#: include/classes/api/services/CImage.php:481 -#: include/classes/api/services/CImage.php:526 -#: include/classes/api/services/CImage.php:544 +#: include/classes/api/services/CImage.php:501 #, c-format msgid "Image \"%1$s\" already exists." msgstr "Изображение \"%1$s\" уже существует." @@ -8427,7 +8376,7 @@ msgstr "Изображение \"%1$s\" уже существует." msgid "Image added" msgstr "Изображение добавлено" -#: app/controllers/CControllerImageDelete.php:62 +#: app/controllers/CControllerImageDelete.php:63 msgid "Image deleted" msgstr "Изображение удалено" @@ -8435,18 +8384,12 @@ msgstr "Изображение удалено" msgid "Image label type" msgstr "Тип подписи к изображению" -#: include/classes/api/services/CImage.php:228 -#, c-format -msgid "Image load error [%1$s] in [%2$s]." -msgstr "Ошибка при загрузке изображения [%1$s] в [%2$s]." - -#: include/classes/api/services/CImage.php:561 #: include/classes/helpers/CUploadFile.php:129 #, c-format msgid "Image size must be less than %1$s." msgstr "Размер изображения должен быть менее %1$s." -#: app/controllers/CControllerImageUpdate.php:135 +#: app/controllers/CControllerImageUpdate.php:147 msgid "Image updated" msgstr "Изображение обновлено" @@ -8552,8 +8495,8 @@ msgstr "Недоступное обслуживание" msgid "Inaccessible map" msgstr "Недоступная карта сети" -#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661 -#: include/httptest.inc.php:218 include/items.inc.php:916 +#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661 +#: include/httptest.inc.php:222 include/items.inc.php:916 #: include/triggers.inc.php:2159 msgid "Inaccessible template" msgstr "Недоступный шаблон" @@ -8602,7 +8545,7 @@ msgstr "Включая подгруппы" msgid "Incoming traffic statistics on network interface. Returns integer" msgstr "Статистика входящего трафика сетевого интерфейса. Возвращает целое число" -#: include/classes/api/services/CService.php:853 +#: include/classes/api/services/CService.php:1362 #, c-format msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"." msgstr "" @@ -8842,8 +8785,6 @@ msgstr "Некорректный пользователь для операци #: include/classes/api/services/CMap.php:1167 #: include/classes/api/services/CMap.php:1240 #: include/classes/api/services/CMap.php:1460 -#: include/classes/api/services/CMediatype.php:189 -#: include/classes/api/services/CMediatype.php:485 msgid "Incorrect arguments passed to function." msgstr "В функцию переданы некорректные аргументы." @@ -8869,7 +8810,7 @@ msgstr "Использованы некорректные символы в им msgid "Incorrect conditions for action \"%1$s\"." msgstr "Некорректные условия в действии \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1805 +#: include/classes/api/services/CDiscoveryRule.php:1801 #, c-format msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "Некорректные условия в правиле обнаружения \"%1$s\"." @@ -8888,12 +8829,12 @@ 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:1811 +#: include/classes/api/services/CDiscoveryRule.php:1807 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." msgstr "Некорректное пользовательское выражение \"%2$s\" для правила обнаружения \"%1$s\": %3$s." -#: include/classes/api/services/CDiscoveryRule.php:1602 +#: include/classes/api/services/CDiscoveryRule.php:1598 #, c-format msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s." msgstr "Некорректное пользовательское выражение \"%2$s\" для замещения \"%1$s\": %3$s." @@ -8922,7 +8863,7 @@ msgstr "Некорректное значение eventobject." msgid "Incorrect eventsource value." msgstr "Некорректное значение eventsource." -#: include/classes/db/DB.php:662 include/classes/db/DB.php:936 +#: include/classes/db/DB.php:691 include/classes/db/DB.php:965 #, c-format msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"." msgstr "Некорректное имя поля \"%1$s\" или значение в выражении where для таблицы \"%2$s\"." @@ -8947,7 +8888,7 @@ msgstr "Некорректный загружаемый файл." msgid "Incorrect filter condition formula ID for action \"%1$s\"." msgstr "Некорректный ID формулы условия фильтра для действия \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1841 +#: include/classes/api/services/CDiscoveryRule.php:1837 #, c-format msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "Некорректный ID формулы условия фильтра для правила обнаружения \"%1$s\"." @@ -8957,12 +8898,12 @@ msgstr "Некорректный ID формулы условия фильтра msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." msgstr "Задан некорректный ID формулы условия фильтра для корреляции \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1833 +#: include/classes/api/services/CDiscoveryRule.php:1829 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." msgstr "Некорректный макрос условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1637 +#: include/classes/api/services/CDiscoveryRule.php:1633 #, c-format msgid "Incorrect filter condition macro for override \"%1$s\"." msgstr "Некорректный макрос условия фильтра для замещения \"%1$s\"." @@ -8973,7 +8914,7 @@ msgstr "Некорректный макрос условия фильтра дл msgid "Incorrect filter condition operator for action \"%1$s\"." msgstr "Некорректный оператор условия фильтра для действия \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1847 +#: include/classes/api/services/CDiscoveryRule.php:1843 #, c-format msgid "Incorrect filter condition operator for discovery rule \"%1$s\"." msgstr "Некорректный оператор условия фильтра для правила обнаружения \"%1$s\"." @@ -9001,8 +8942,6 @@ msgstr "Некорректный индекс изображения." #: include/classes/api/services/CHost.php:964 #: include/classes/api/services/CHost.php:1879 #: include/classes/api/services/CHost.php:2116 -#: include/classes/api/services/CImage.php:460 -#: include/classes/api/services/CImage.php:506 #: include/classes/api/services/CTemplate.php:497 #: include/classes/api/services/CTemplate.php:674 #: include/classes/api/services/CTrigger.php:803 @@ -9064,13 +9003,9 @@ msgstr "Некорректный период обслуживания (мини msgid "Incorrect map ID." msgstr "Некорректный ID карты сети." -#: include/classes/api/services/CMediatype.php:455 -msgid "Incorrect media type ID." -msgstr "Некорректный ID типа оповещений." - #: include/classes/api/clients/CLocalApiClient.php:79 #: include/classes/api/services/CSettings.php:93 -#: include/classes/api/services/CUser.php:1637 +#: include/classes/api/services/CUser.php:1631 #, c-format msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Некорректный метод \"%1$s.%2$s\"." @@ -9125,13 +9060,13 @@ msgstr "Некорректное регулярное выражение \"%1$s\ msgid "Incorrect response received from Zabbix server \"%1$s\"." msgstr "Получен некорректный ответ от Zabbix сервера \"%1$s\"." -#: app/controllers/CControllerServiceTimeValidate.php:62 -#: app/controllers/CControllerServiceTimeValidate.php:83 +#: app/controllers/CControllerServiceTimeValidate.php:66 +#: app/controllers/CControllerServiceTimeValidate.php:87 msgid "Incorrect service end time." msgstr "Некорректное время завершения услуги." -#: app/controllers/CControllerServiceTimeValidate.php:53 -#: app/controllers/CControllerServiceTimeValidate.php:75 +#: app/controllers/CControllerServiceTimeValidate.php:57 +#: app/controllers/CControllerServiceTimeValidate.php:79 msgid "Incorrect service start time." msgstr "Некорректное время начала услуги." @@ -9189,7 +9124,7 @@ msgstr "Некорректный тип вычисления для действ msgid "Incorrect type of calculation for correlation \"%1$s\"." msgstr "Некорректный тип вычисления для корреляции \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1798 +#: include/classes/api/services/CDiscoveryRule.php:1794 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." msgstr "Некорректный тип вычисления для правила обнаружения \"%1$s\"." @@ -9210,10 +9145,10 @@ msgstr "Указано некорректное значение ID пользо msgid "Incorrect user group ID specified for map \"%1$s\"." msgstr "Указано некорректное значение ID группы пользователей у карты сети \"%1$s\"." -#: include/classes/api/services/CUser.php:1530 -#: include/classes/api/services/CUser.php:1544 -#: include/classes/api/services/CUser.php:1579 -#: include/classes/api/services/CUser.php:2043 +#: include/classes/api/services/CUser.php:1524 +#: include/classes/api/services/CUser.php:1538 +#: include/classes/api/services/CUser.php:1573 +#: include/classes/api/services/CUser.php:2037 #: include/classes/validators/CLdapAuthValidator.php:88 index_http.php:83 msgid "Incorrect user name or password or account is temporarily blocked." msgstr "Некорректные имя пользователя или пароль или аккаунт временно заблокирован." @@ -9235,13 +9170,13 @@ msgstr "Некорректные имя пользователя или паро #: include/classes/api/services/CDRule.php:605 #: include/classes/api/services/CItemGeneral.php:525 #: include/classes/api/services/CItemGeneral.php:2585 -#: include/classes/validators/CNewValidator.php:122 -#: include/classes/validators/CNewValidator.php:135 +#: include/classes/validators/CNewValidator.php:124 +#: include/classes/validators/CNewValidator.php:136 #: include/classes/validators/CNewValidator.php:148 -#: include/classes/validators/CNewValidator.php:164 -#: include/classes/validators/CNewValidator.php:178 -#: include/classes/validators/CNewValidator.php:198 -#: include/classes/validators/CNewValidator.php:249 +#: include/classes/validators/CNewValidator.php:160 +#: include/classes/validators/CNewValidator.php:172 +#: include/classes/validators/CNewValidator.php:184 +#: include/classes/validators/CNewValidator.php:223 #: include/validate.inc.php:347 #, c-format msgid "Incorrect value \"%1$s\" for \"%2$s\" field." @@ -9258,19 +9193,19 @@ msgstr "Некорректное значение \"%1$s\" для \"%2$s\" по msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s." msgstr "Некорректное значение \"%1$s\" для \"%2$s\" поля: должно быть между %3$s и %4$s." -#: include/classes/db/DB.php:410 +#: include/classes/db/DB.php:413 #, c-format msgid "Incorrect value \"%1$s\" for float field \"%2$s\"." msgstr "Некорректное значение \"%1$s\" для поля с плавающей точкой \"%2$s\"." -#: include/classes/db/DB.php:404 +#: include/classes/db/DB.php:406 #, c-format msgid "Incorrect value \"%1$s\" for int field \"%2$s\"." msgstr "Некорректное значение \"%1$s\" для поля целого числа \"%2$s\"." #: include/classes/api/services/CMaintenance.php:400 #: include/classes/api/services/CMaintenance.php:668 -#: include/classes/db/DB.php:398 +#: include/classes/db/DB.php:399 #, c-format msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"." msgstr "Некорректное значение \"%1$s\" для поля целого положительного числа \"%2$s\"." @@ -9287,31 +9222,13 @@ msgstr "Некорректное значение \"%1$s\" для поля це msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"." msgstr "Некорректное значение \"%1$s\" в поле \"%2$s\" у корреляции \"%3$s\"." -#: include/classes/api/services/CMediatype.php:245 -#: include/classes/api/services/CMediatype.php:256 -#: include/classes/api/services/CMediatype.php:275 -#: include/classes/api/services/CMediatype.php:291 -#: include/classes/api/services/CMediatype.php:307 -#: include/classes/api/services/CMediatype.php:326 -#: include/classes/api/services/CMediatype.php:366 -#: include/classes/api/services/CMediatype.php:566 -#: include/classes/api/services/CMediatype.php:579 -#: include/classes/api/services/CMediatype.php:598 -#: include/classes/api/services/CMediatype.php:615 -#: include/classes/api/services/CMediatype.php:632 -#: include/classes/api/services/CMediatype.php:652 -#: include/classes/api/services/CMediatype.php:692 -#: include/classes/api/services/CMediatype.php:1181 -#, c-format -msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"." -msgstr "Некорректное значение \"%1$s\" в поле \"%2$s\" у типа оповещений \"%3$s\"." - -#: include/classes/validators/CNewValidator.php:123 -#: include/classes/validators/CNewValidator.php:136 +#: include/classes/validators/CNewValidator.php:125 +#: include/classes/validators/CNewValidator.php:137 #: include/classes/validators/CNewValidator.php:149 -#: include/classes/validators/CNewValidator.php:165 -#: include/classes/validators/CNewValidator.php:199 -#: include/classes/validators/CNewValidator.php:250 +#: include/classes/validators/CNewValidator.php:161 +#: include/classes/validators/CNewValidator.php:173 +#: include/classes/validators/CNewValidator.php:185 +#: include/classes/validators/CNewValidator.php:224 #: include/validate.inc.php:350 #, c-format msgid "Incorrect value for \"%1$s\" field." @@ -9372,8 +9289,8 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/api/services/CCorrelation.php:1125 #: include/classes/api/services/CCorrelation.php:1144 #: include/classes/api/services/CCorrelation.php:1158 -#: include/classes/api/services/CDiscoveryRule.php:1869 -#: include/classes/api/services/CDiscoveryRule.php:2283 +#: include/classes/api/services/CDiscoveryRule.php:1865 +#: include/classes/api/services/CDiscoveryRule.php:2279 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 #: include/classes/api/services/CDRule.php:221 @@ -9483,24 +9400,6 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/api/services/CMap.php:688 #: include/classes/api/services/CMap.php:1151 #: include/classes/api/services/CMap.php:1157 -#: include/classes/api/services/CMediatype.php:377 -#: include/classes/api/services/CMediatype.php:387 -#: include/classes/api/services/CMediatype.php:396 -#: include/classes/api/services/CMediatype.php:403 -#: include/classes/api/services/CMediatype.php:412 -#: include/classes/api/services/CMediatype.php:421 -#: include/classes/api/services/CMediatype.php:427 -#: include/classes/api/services/CMediatype.php:489 -#: include/classes/api/services/CMediatype.php:704 -#: include/classes/api/services/CMediatype.php:714 -#: include/classes/api/services/CMediatype.php:721 -#: include/classes/api/services/CMediatype.php:730 -#: include/classes/api/services/CMediatype.php:737 -#: include/classes/api/services/CMediatype.php:747 -#: include/classes/api/services/CMediatype.php:756 -#: include/classes/api/services/CMediatype.php:762 -#: include/classes/api/services/CMediatype.php:793 -#: include/classes/api/services/CMediatype.php:800 #: include/classes/api/services/CSettings.php:274 #: include/classes/api/services/CTemplate.php:450 #: include/classes/api/services/CTriggerGeneral.php:148 @@ -9513,8 +9412,8 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:759 -#: include/classes/api/services/CUser.php:2121 +#: include/classes/api/services/CUser.php:753 +#: include/classes/api/services/CUser.php:2115 #: include/classes/graphdraw/CLineGraphDraw.php:115 #: include/classes/graphdraw/CLineGraphDraw.php:240 #: include/classes/graphdraw/CLineGraphDraw.php:250 @@ -9558,16 +9457,17 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/validators/CEventCorrCondValidator.php:87 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CEventCorrCondValidator.php:96 -#: include/classes/validators/CNewValidator.php:97 -#: include/classes/validators/CNewValidator.php:107 -#: include/classes/validators/CNewValidator.php:214 -#: include/classes/validators/CNewValidator.php:230 -#: include/classes/validators/CNewValidator.php:273 -#: include/classes/validators/CNewValidator.php:285 -#: include/classes/validators/CNewValidator.php:299 -#: include/classes/validators/CNewValidator.php:312 -#: include/classes/validators/CNewValidator.php:326 -#: include/classes/validators/CNewValidator.php:338 +#: include/classes/validators/CNewValidator.php:103 +#: include/classes/validators/CNewValidator.php:113 +#: include/classes/validators/CNewValidator.php:195 +#: include/classes/validators/CNewValidator.php:207 +#: include/classes/validators/CNewValidator.php:238 +#: include/classes/validators/CNewValidator.php:252 +#: include/classes/validators/CNewValidator.php:269 +#: include/classes/validators/CNewValidator.php:278 +#: include/classes/validators/CNewValidator.php:290 +#: include/classes/validators/CNewValidator.php:300 +#: include/classes/validators/CNewValidator.php:310 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124 #: include/items.inc.php:2078 include/sounds.inc.php:113 @@ -9576,7 +9476,7 @@ msgstr "Некорректное значение для \"%1$s\" поля." msgid "Incorrect value for field \"%1$s\": %2$s." msgstr "Некорректное значение для поля \"%1$s\": %2$s." -#: include/classes/helpers/CServiceHelper.php:147 +#: include/classes/helpers/CServiceHelper.php:149 msgid "Increase by" msgstr "" @@ -9669,7 +9569,7 @@ msgid "Insert" msgstr "Вставить" #: include/views/configuration.trigger.prototype.edit.php:136 -#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340 +#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321 msgid "Insert expression" msgstr "Вставить выражение" @@ -9773,7 +9673,7 @@ msgstr "Внутренняя проблема" msgid "Internal problem recovery" msgstr "Восстановление внутренней проблемы" -#: include/httptest.inc.php:399 +#: include/httptest.inc.php:403 msgid "Internet Explorer" msgstr "Internet Explorer" @@ -9781,7 +9681,7 @@ msgstr "Internet Explorer" #: app/views/configuration.discovery.list.php:79 #: app/views/popup.lldoperation.php:115 #: app/views/popup.massupdate.item.php:226 -#: app/views/popup.service.edit.php:219 include/forms.inc.php:565 +#: app/views/popup.service.edit.php:232 include/forms.inc.php:565 #: include/views/configuration.host.discovery.edit.php:584 #: include/views/configuration.host.discovery.list.php:199 #: include/views/configuration.httpconf.list.php:136 @@ -9792,7 +9692,7 @@ msgstr "Internet Explorer" msgid "Interval" msgstr "Интервал" -#: include/classes/api/services/CRole.php:719 +#: include/classes/api/services/CRole.php:720 #, c-format msgid "Invalid API method \"%2$s\" for user role \"%1$s\"." msgstr "" @@ -9829,7 +9729,7 @@ msgstr "Ошибочная дата." msgid "Invalid email address \"%1$s\"." msgstr "Ошибочный email адрес \"%1$s\"." -#: include/classes/api/services/CUser.php:934 +#: include/classes/api/services/CUser.php:928 #, c-format msgid "Invalid email address for media type with ID \"%1$s\"." msgstr "Ошибочный email адрес у способа оповещения с ID \"%1$s\"." @@ -9847,7 +9747,7 @@ msgstr "Ошибочный email адрес у способа оповещени msgid "Invalid interval \"%1$s\"." msgstr "Некорректный интервал \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:66 +#: include/classes/api/services/CDiscoveryRule.php:62 #, 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." @@ -9872,27 +9772,27 @@ msgstr "Ошибочный ключ \"%1$s\": %2$s." msgid "Invalid method parameters." msgstr "Ошибочные параметры метода." -#: app/controllers/CControllerDashboardUpdate.php:187 -#: app/controllers/CControllerDashboardUpdate.php:196 -#: app/controllers/CControllerDashboardUpdate.php:208 +#: app/controllers/CControllerDashboardUpdate.php:191 +#: app/controllers/CControllerDashboardUpdate.php:200 +#: app/controllers/CControllerDashboardUpdate.php:212 #: app/controllers/CControllerPopupHttpStep.php:100 #: include/classes/api/services/CAutoregistration.php:147 #: include/classes/api/services/CAutoregistration.php:153 #: include/classes/api/services/CAutoregistration.php:160 -#: include/classes/api/services/CDiscoveryRule.php:1649 -#: include/classes/api/services/CDiscoveryRule.php:1669 -#: include/classes/api/services/CDiscoveryRule.php:1682 -#: include/classes/api/services/CDiscoveryRule.php:1701 -#: include/classes/api/services/CDiscoveryRule.php:1712 -#: include/classes/api/services/CDiscoveryRule.php:1724 -#: include/classes/api/services/CDiscoveryRule.php:1732 -#: include/classes/api/services/CDiscoveryRule.php:1743 -#: include/classes/api/services/CDiscoveryRule.php:1755 -#: include/classes/api/services/CDiscoveryRule.php:1889 -#: include/classes/api/services/CDiscoveryRule.php:1975 -#: include/classes/api/services/CDiscoveryRule.php:1992 -#: include/classes/api/services/CDiscoveryRule.php:2010 -#: include/classes/api/services/CDiscoveryRule.php:2018 +#: include/classes/api/services/CDiscoveryRule.php:1645 +#: include/classes/api/services/CDiscoveryRule.php:1665 +#: include/classes/api/services/CDiscoveryRule.php:1678 +#: include/classes/api/services/CDiscoveryRule.php:1697 +#: include/classes/api/services/CDiscoveryRule.php:1708 +#: include/classes/api/services/CDiscoveryRule.php:1720 +#: include/classes/api/services/CDiscoveryRule.php:1728 +#: include/classes/api/services/CDiscoveryRule.php:1739 +#: include/classes/api/services/CDiscoveryRule.php:1751 +#: include/classes/api/services/CDiscoveryRule.php:1885 +#: include/classes/api/services/CDiscoveryRule.php:1971 +#: include/classes/api/services/CDiscoveryRule.php:1988 +#: include/classes/api/services/CDiscoveryRule.php:2006 +#: include/classes/api/services/CDiscoveryRule.php:2014 #: include/classes/api/services/CGraphGeneral.php:626 #: include/classes/api/services/CGraphGeneral.php:749 #: include/classes/api/services/CHostBase.php:522 @@ -9936,14 +9836,14 @@ msgstr "Ошибочные параметры метода." #: include/classes/api/services/CReport.php:582 #: include/classes/api/services/CReport.php:596 #: include/classes/api/services/CReport.php:602 -#: include/classes/api/services/CScript.php:1025 -#: include/classes/api/services/CScript.php:1031 +#: include/classes/api/services/CScript.php:884 +#: include/classes/api/services/CScript.php:890 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:665 #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1792 -#: include/classes/api/services/CUser.php:908 -#: include/classes/api/services/CUser.php:919 +#: include/classes/api/services/CUser.php:902 +#: include/classes/api/services/CUser.php:913 #: include/classes/api/services/CValueMap.php:432 #: include/classes/api/services/CValueMap.php:581 #: include/classes/api/services/CValueMap.php:591 @@ -9951,106 +9851,111 @@ msgstr "Ошибочные параметры метода." #: include/classes/helpers/CDashboardHelper.php:388 #: include/classes/helpers/CDashboardHelper.php:396 #: include/classes/helpers/CDashboardHelper.php:406 -#: include/classes/validators/CApiInputValidator.php:318 -#: include/classes/validators/CApiInputValidator.php:323 -#: include/classes/validators/CApiInputValidator.php:328 -#: include/classes/validators/CApiInputValidator.php:355 -#: include/classes/validators/CApiInputValidator.php:368 -#: include/classes/validators/CApiInputValidator.php:379 -#: include/classes/validators/CApiInputValidator.php:409 -#: include/classes/validators/CApiInputValidator.php:517 -#: include/classes/validators/CApiInputValidator.php:523 -#: include/classes/validators/CApiInputValidator.php:555 -#: include/classes/validators/CApiInputValidator.php:560 -#: include/classes/validators/CApiInputValidator.php:602 -#: include/classes/validators/CApiInputValidator.php:607 -#: include/classes/validators/CApiInputValidator.php:641 -#: include/classes/validators/CApiInputValidator.php:646 -#: include/classes/validators/CApiInputValidator.php:687 -#: include/classes/validators/CApiInputValidator.php:692 -#: include/classes/validators/CApiInputValidator.php:747 -#: include/classes/validators/CApiInputValidator.php:785 -#: include/classes/validators/CApiInputValidator.php:790 -#: include/classes/validators/CApiInputValidator.php:846 -#: include/classes/validators/CApiInputValidator.php:871 -#: include/classes/validators/CApiInputValidator.php:904 -#: include/classes/validators/CApiInputValidator.php:909 -#: include/classes/validators/CApiInputValidator.php:950 -#: include/classes/validators/CApiInputValidator.php:955 -#: include/classes/validators/CApiInputValidator.php:960 -#: include/classes/validators/CApiInputValidator.php:996 -#: include/classes/validators/CApiInputValidator.php:1052 +#: include/classes/validators/CApiInputValidator.php:326 +#: include/classes/validators/CApiInputValidator.php:331 +#: include/classes/validators/CApiInputValidator.php:336 +#: include/classes/validators/CApiInputValidator.php:363 +#: include/classes/validators/CApiInputValidator.php:376 +#: include/classes/validators/CApiInputValidator.php:387 +#: include/classes/validators/CApiInputValidator.php:417 +#: include/classes/validators/CApiInputValidator.php:525 +#: include/classes/validators/CApiInputValidator.php:531 +#: include/classes/validators/CApiInputValidator.php:563 +#: include/classes/validators/CApiInputValidator.php:568 +#: include/classes/validators/CApiInputValidator.php:610 +#: include/classes/validators/CApiInputValidator.php:615 +#: include/classes/validators/CApiInputValidator.php:649 +#: include/classes/validators/CApiInputValidator.php:654 +#: include/classes/validators/CApiInputValidator.php:695 +#: include/classes/validators/CApiInputValidator.php:700 +#: include/classes/validators/CApiInputValidator.php:755 +#: include/classes/validators/CApiInputValidator.php:793 +#: include/classes/validators/CApiInputValidator.php:798 +#: include/classes/validators/CApiInputValidator.php:854 +#: include/classes/validators/CApiInputValidator.php:879 +#: include/classes/validators/CApiInputValidator.php:912 +#: include/classes/validators/CApiInputValidator.php:917 +#: include/classes/validators/CApiInputValidator.php:958 +#: include/classes/validators/CApiInputValidator.php:963 +#: include/classes/validators/CApiInputValidator.php:968 +#: include/classes/validators/CApiInputValidator.php:1004 #: include/classes/validators/CApiInputValidator.php:1060 -#: include/classes/validators/CApiInputValidator.php:1090 -#: include/classes/validators/CApiInputValidator.php:1135 -#: include/classes/validators/CApiInputValidator.php:1162 -#: include/classes/validators/CApiInputValidator.php:1167 -#: include/classes/validators/CApiInputValidator.php:1174 -#: include/classes/validators/CApiInputValidator.php:1205 -#: include/classes/validators/CApiInputValidator.php:1250 -#: include/classes/validators/CApiInputValidator.php:1255 -#: include/classes/validators/CApiInputValidator.php:1294 -#: include/classes/validators/CApiInputValidator.php:1299 -#: include/classes/validators/CApiInputValidator.php:1304 -#: include/classes/validators/CApiInputValidator.php:1350 -#: include/classes/validators/CApiInputValidator.php:1359 -#: include/classes/validators/CApiInputValidator.php:1365 -#: include/classes/validators/CApiInputValidator.php:1393 -#: include/classes/validators/CApiInputValidator.php:1403 -#: include/classes/validators/CApiInputValidator.php:1409 -#: include/classes/validators/CApiInputValidator.php:1447 -#: include/classes/validators/CApiInputValidator.php:1459 -#: include/classes/validators/CApiInputValidator.php:1468 -#: include/classes/validators/CApiInputValidator.php:1475 -#: include/classes/validators/CApiInputValidator.php:1480 -#: include/classes/validators/CApiInputValidator.php:1522 -#: include/classes/validators/CApiInputValidator.php:1539 -#: include/classes/validators/CApiInputValidator.php:1565 -#: include/classes/validators/CApiInputValidator.php:1572 -#: include/classes/validators/CApiInputValidator.php:1596 -#: include/classes/validators/CApiInputValidator.php:1601 -#: include/classes/validators/CApiInputValidator.php:1627 -#: include/classes/validators/CApiInputValidator.php:1634 -#: include/classes/validators/CApiInputValidator.php:1661 -#: include/classes/validators/CApiInputValidator.php:1668 -#: include/classes/validators/CApiInputValidator.php:1695 -#: include/classes/validators/CApiInputValidator.php:1704 -#: include/classes/validators/CApiInputValidator.php:1741 -#: include/classes/validators/CApiInputValidator.php:1757 -#: include/classes/validators/CApiInputValidator.php:1768 -#: include/classes/validators/CApiInputValidator.php:1801 -#: include/classes/validators/CApiInputValidator.php:1892 -#: include/classes/validators/CApiInputValidator.php:1977 -#: include/classes/validators/CApiInputValidator.php:1982 -#: include/classes/validators/CApiInputValidator.php:2009 -#: include/classes/validators/CApiInputValidator.php:2019 -#: include/classes/validators/CApiInputValidator.php:2051 -#: include/classes/validators/CApiInputValidator.php:2063 -#: include/classes/validators/CApiInputValidator.php:2093 -#: include/classes/validators/CApiInputValidator.php:2100 -#: include/classes/validators/CApiInputValidator.php:2132 -#: include/classes/validators/CApiInputValidator.php:2143 -#: include/classes/validators/CApiInputValidator.php:2166 -#: include/classes/validators/CApiInputValidator.php:2181 -#: include/classes/validators/CApiInputValidator.php:2234 -#: include/classes/validators/CApiInputValidator.php:2244 -#: include/classes/validators/CApiInputValidator.php:2254 -#: include/classes/validators/CApiInputValidator.php:2278 -#: include/classes/validators/CApiInputValidator.php:2285 -#: include/classes/validators/CApiInputValidator.php:2307 -#: include/classes/validators/CApiInputValidator.php:2327 -#: include/classes/validators/CApiInputValidator.php:2357 -#: include/classes/validators/CApiInputValidator.php:2362 -#: include/classes/validators/CApiInputValidator.php:2398 -#: include/classes/validators/CApiInputValidator.php:2405 -#: include/classes/validators/CApiInputValidator.php:2430 -#: include/classes/validators/CApiInputValidator.php:2435 -#: include/classes/validators/CApiInputValidator.php:2441 -#: include/classes/validators/CApiInputValidator.php:2474 -#: include/classes/validators/CApiInputValidator.php:2507 -#: include/classes/validators/CApiInputValidator.php:2514 -#: include/classes/validators/CApiInputValidator.php:2538 -#: include/classes/validators/CApiInputValidator.php:2545 +#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1073 +#: include/classes/validators/CApiInputValidator.php:1103 +#: include/classes/validators/CApiInputValidator.php:1148 +#: include/classes/validators/CApiInputValidator.php:1175 +#: include/classes/validators/CApiInputValidator.php:1180 +#: include/classes/validators/CApiInputValidator.php:1187 +#: include/classes/validators/CApiInputValidator.php:1218 +#: include/classes/validators/CApiInputValidator.php:1263 +#: include/classes/validators/CApiInputValidator.php:1268 +#: include/classes/validators/CApiInputValidator.php:1307 +#: include/classes/validators/CApiInputValidator.php:1312 +#: include/classes/validators/CApiInputValidator.php:1317 +#: include/classes/validators/CApiInputValidator.php:1363 +#: include/classes/validators/CApiInputValidator.php:1372 +#: include/classes/validators/CApiInputValidator.php:1378 +#: include/classes/validators/CApiInputValidator.php:1406 +#: include/classes/validators/CApiInputValidator.php:1416 +#: include/classes/validators/CApiInputValidator.php:1422 +#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:1481 +#: include/classes/validators/CApiInputValidator.php:1488 +#: include/classes/validators/CApiInputValidator.php:1493 +#: include/classes/validators/CApiInputValidator.php:1535 +#: include/classes/validators/CApiInputValidator.php:1552 +#: include/classes/validators/CApiInputValidator.php:1578 +#: include/classes/validators/CApiInputValidator.php:1585 +#: include/classes/validators/CApiInputValidator.php:1609 +#: include/classes/validators/CApiInputValidator.php:1614 +#: include/classes/validators/CApiInputValidator.php:1640 +#: include/classes/validators/CApiInputValidator.php:1647 +#: include/classes/validators/CApiInputValidator.php:1674 +#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CApiInputValidator.php:1708 +#: include/classes/validators/CApiInputValidator.php:1717 +#: include/classes/validators/CApiInputValidator.php:1754 +#: include/classes/validators/CApiInputValidator.php:1770 +#: include/classes/validators/CApiInputValidator.php:1781 +#: include/classes/validators/CApiInputValidator.php:1814 +#: include/classes/validators/CApiInputValidator.php:1905 +#: include/classes/validators/CApiInputValidator.php:1990 +#: include/classes/validators/CApiInputValidator.php:1995 +#: include/classes/validators/CApiInputValidator.php:2022 +#: include/classes/validators/CApiInputValidator.php:2032 +#: include/classes/validators/CApiInputValidator.php:2064 +#: include/classes/validators/CApiInputValidator.php:2076 +#: include/classes/validators/CApiInputValidator.php:2106 +#: include/classes/validators/CApiInputValidator.php:2113 +#: include/classes/validators/CApiInputValidator.php:2145 +#: include/classes/validators/CApiInputValidator.php:2156 +#: include/classes/validators/CApiInputValidator.php:2179 +#: include/classes/validators/CApiInputValidator.php:2194 +#: include/classes/validators/CApiInputValidator.php:2247 +#: include/classes/validators/CApiInputValidator.php:2257 +#: include/classes/validators/CApiInputValidator.php:2267 +#: include/classes/validators/CApiInputValidator.php:2291 +#: include/classes/validators/CApiInputValidator.php:2298 +#: include/classes/validators/CApiInputValidator.php:2320 +#: include/classes/validators/CApiInputValidator.php:2340 +#: include/classes/validators/CApiInputValidator.php:2370 +#: include/classes/validators/CApiInputValidator.php:2375 +#: include/classes/validators/CApiInputValidator.php:2411 +#: include/classes/validators/CApiInputValidator.php:2418 +#: include/classes/validators/CApiInputValidator.php:2443 +#: include/classes/validators/CApiInputValidator.php:2448 +#: include/classes/validators/CApiInputValidator.php:2454 +#: include/classes/validators/CApiInputValidator.php:2487 +#: include/classes/validators/CApiInputValidator.php:2520 +#: include/classes/validators/CApiInputValidator.php:2527 +#: include/classes/validators/CApiInputValidator.php:2551 +#: include/classes/validators/CApiInputValidator.php:2558 +#: include/classes/validators/CApiInputValidator.php:2583 +#: include/classes/validators/CApiInputValidator.php:2590 +#: include/classes/validators/CApiInputValidator.php:2618 +#: include/classes/validators/CApiInputValidator.php:2623 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499 @@ -10149,7 +10054,7 @@ msgstr "Ошибочный период времени." #: include/classes/helpers/CMenuHelper.php:103 #: include/classes/helpers/CRoleHelper.php:278 #: include/views/configuration.host.edit.php:446 -#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348 +#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329 msgid "Inventory" msgstr "Инвентаризация" @@ -10190,7 +10095,7 @@ msgstr "Невозможно выполнить поиск по паролям msgid "Italian (it_IT)" msgstr "Итальянский (it_IT)" -#: app/controllers/CControllerAuditLogList.php:224 +#: app/controllers/CControllerAuditLogList.php:225 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99 #: app/views/popup.triggerwizard.php:92 #: include/classes/screens/CScreenHistory.php:268 @@ -10222,7 +10127,7 @@ msgstr "Нельзя скопировать элемент данных \"%1$s\" msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d." msgstr "Элемент данных \"%1$s\" не может заполнять отсутствующее поле под номером \"%2$d\" инвентарных данных узла сети. Выберите из: от 0 (не заполнять) до %3$d." -#: include/classes/api/services/CDiscoveryRule.php:2284 +#: include/classes/api/services/CDiscoveryRule.php:2280 #: include/classes/api/services/CItemGeneral.php:2233 #, c-format msgid "Item \"%1$s\" does not exist or you have no access to this item" @@ -10236,7 +10141,7 @@ msgstr "Элемент данных добавлен" msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually." msgstr "Элемент данных содержит пользовательский макрос со скрытыми значениями. Значения таких макросов необходимо ввести вручную." -#: items.php:1053 +#: items.php:1021 msgid "Item copied" msgid_plural "Items copied" msgstr[0] "Элемент даных скопирован" @@ -10251,14 +10156,14 @@ msgstr "Количество элементов данных" msgid "Item deleted" msgstr "Элемент данных удален" -#: items.php:1011 +#: items.php:979 msgid "Item disabled" msgid_plural "Items disabled" msgstr[0] "Элемент данных деактивирован" msgstr[1] "Элементы данных деактивированы" msgstr[2] "Элементы данных деактивированы" -#: items.php:1010 +#: items.php:978 msgid "Item enabled" msgid_plural "Items enabled" msgstr[0] "Элемент данных активирован" @@ -10278,7 +10183,7 @@ msgstr "Элемент данных не выбран" msgid "Item pre-processing is missing parameters: %1$s" msgstr "Отсутствуют параметры у предобработки элемента данных: %1$s" -#: app/controllers/CControllerAuditLogList.php:225 +#: app/controllers/CControllerAuditLogList.php:226 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48 #: include/forms.inc.php:892 @@ -10343,7 +10248,7 @@ msgstr "Прототипы элементов данных обновлены" msgid "Item tags" msgstr "Теги элемента данных" -#: jsLoader.php:370 +#: jsLoader.php:351 msgid "Item type does not use interface" msgstr "Тип элемента данных не использует интерфейс" @@ -10427,11 +10332,11 @@ msgstr "Элемент данных с ключом \"%1$s\" уже сущест #: include/views/configuration.template.list.php:118 #: include/views/configuration.template.list.php:206 #: include/views/inventory.host.view.php:182 -#: include/views/inventory.host.view.php:215 items.php:1292 +#: include/views/inventory.host.view.php:215 items.php:1214 msgid "Items" msgstr "Элементы данных" -#: items.php:1126 +#: items.php:1048 msgid "Items deleted" msgstr "Элементы данных удалены" @@ -10474,6 +10379,10 @@ msgstr "Интерфейсы JMX" msgid "JSON" msgstr "JSON" +#: include/classes/mvc/CController.php:231 +msgid "JSON array input is expected." +msgstr "" + #: app/views/popup.massupdate.item.php:95 #: include/views/configuration.host.discovery.edit.php:272 #: include/views/configuration.item.edit.php:308 @@ -10486,7 +10395,7 @@ msgstr "JSON данные" msgid "JSON is expected" msgstr "ожидался JSON" -#: include/classes/validators/CNewValidator.php:107 +#: include/classes/validators/CNewValidator.php:113 msgid "JSON string is expected" msgstr "ожидалась JSON строка" @@ -10504,7 +10413,7 @@ msgstr "JSONPath" msgid "Jan" msgstr "Янв" -#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221 +#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202 msgid "January" msgstr "Январь" @@ -10526,7 +10435,7 @@ msgstr "JavaScript" msgid "Jul" msgstr "Июл" -#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227 +#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208 msgid "July" msgstr "Июль" @@ -10534,7 +10443,7 @@ msgstr "Июль" msgid "Jun" msgstr "Июн" -#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226 +#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207 msgid "June" msgstr "Июнь" @@ -10638,7 +10547,7 @@ msgstr "Расположение подписи" msgid "Language" msgstr "Язык" -#: include/classes/api/services/CUser.php:775 +#: include/classes/api/services/CUser.php:769 #, c-format msgid "Language \"%1$s\" is not supported." msgstr "Язык \"%1$s\" не поддерживается." @@ -10696,22 +10605,6 @@ msgstr[0] "Последний %1$d год" msgstr[1] "Последние %1$d года" msgstr[2] "Последний %1$d лет" -#: srv_status.php:42 -msgid "Last 24 hours" -msgstr "" - -#: srv_status.php:44 -msgid "Last 30 days" -msgstr "" - -#: srv_status.php:45 -msgid "Last 365 days" -msgstr "" - -#: srv_status.php:43 -msgid "Last 7 days" -msgstr "" - #: app/views/administration.token.list.php:144 #: app/views/administration.user.token.list.php:99 msgid "Last accessed at" @@ -10723,11 +10616,11 @@ msgstr "Время последнего использования" msgid "Last check" msgstr "Последняя проверка" -#: jsLoader.php:351 +#: jsLoader.php:332 msgid "Last hour graph" msgstr "График за последний час" -#: jsLoader.php:352 +#: jsLoader.php:333 msgid "Last month graph" msgstr "График за последний месяц" @@ -10765,7 +10658,7 @@ msgstr "Последняя отправка" msgid "Last value" msgstr "Последнее значение" -#: jsLoader.php:353 +#: jsLoader.php:334 msgid "Last week graph" msgstr "График за последнюю неделю" @@ -10778,11 +10671,11 @@ msgstr "График за последнюю неделю" #: include/classes/helpers/CMenuHelper.php:61 #: include/classes/helpers/CRoleHelper.php:311 #: include/views/inventory.host.view.php:143 -#: include/views/inventory.host.view.php:149 jsLoader.php:349 +#: include/views/inventory.host.view.php:149 jsLoader.php:330 msgid "Latest data" msgstr "Последние данные" -#: jsLoader.php:350 +#: jsLoader.php:331 msgid "Latest values" msgstr "Последние значения" @@ -10823,7 +10716,7 @@ msgstr "Ось Y слева" msgid "Left trim" msgstr "Обрезать слева" -#: include/classes/widgets/views/widget.svggraph.form.view.php:294 +#: include/classes/widgets/views/widget.svggraph.form.view.php:295 msgid "Legend" msgstr "Легенда" @@ -11104,7 +10997,7 @@ msgstr "Правило низкоуровневого обнаружения в msgid "M" msgstr "M" -#: jsLoader.php:240 +#: jsLoader.php:221 msgctxt "Monday short" msgid "M" msgstr "Пн" @@ -11126,7 +11019,7 @@ msgstr "MD2" msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)" msgstr "Сумма MD5 файла. Возвращает символьную строку (MD5 хеш файла)" -#: app/controllers/CControllerAuditLogList.php:226 +#: app/controllers/CControllerAuditLogList.php:227 #: app/partials/hostmacros.inherited.list.html.php:48 #: app/partials/hostmacros.list.html.php:35 #: app/partials/massupdate.macros.tab.php:29 @@ -11170,7 +11063,7 @@ msgstr "Макросы обновлены" #: app/views/monitoring.map.view.php:45 #: include/views/monitoring.overview.items.php:70 #: include/views/monitoring.overview.triggers.php:106 report2.php:198 -#: report4.php:124 srv_status.php:161 +#: report4.php:124 msgid "Main filter" msgstr "Основной фильтр" @@ -11178,7 +11071,7 @@ msgstr "Основной фильтр" msgid "Main navigation" msgstr "Основная навигация" -#: app/controllers/CControllerAuditLogList.php:227 +#: app/controllers/CControllerAuditLogList.php:228 #: include/classes/helpers/CMenuHelper.php:174 #: include/classes/helpers/CRoleHelper.php:362 #: include/views/configuration.maintenance.edit.php:259 @@ -11283,13 +11176,13 @@ msgstr "Действие вручную над узлом сети" msgid "Manually closed" msgstr "Закрыт вручную" -#: app/controllers/CControllerAuditLogList.php:228 +#: app/controllers/CControllerAuditLogList.php:229 #: include/classes/widgets/CWidgetConfig.php:54 #: include/classes/widgets/forms/CWidgetFormMap.php:41 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27 #: include/views/js/monitoring.sysmaps.js.php:93 #: include/views/js/monitoring.sysmaps.js.php:208 -#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25 +#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25 msgid "Map" msgstr "Карта сети" @@ -11390,7 +11283,7 @@ msgstr "Карты сетей" msgid "Mar" msgstr "Мрт." -#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223 +#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204 msgid "March" msgstr "Март" @@ -11494,7 +11387,7 @@ msgid "Maximum required %1$s database version is %2$s." msgstr "" #: app/controllers/CControllerTimeSelectorUpdate.php:249 -#: include/classes/mvc/CController.php:259 +#: include/classes/mvc/CController.php:312 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444 #: include/validate.inc.php:477 #, c-format @@ -11504,12 +11397,12 @@ msgstr[0] "Максимальный период времени отображе msgstr[1] "Максимальный период времени отображения %1$s дня." msgstr[2] "Максимальный период времени отображения %1$s дней." -#: include/classes/api/services/CUser.php:941 +#: include/classes/api/services/CUser.php:935 #, c-format msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "Превышена максимальная длина email адреса у способа оповещения с ID \"%1$s\"." -#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225 +#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206 msgid "May" msgstr "Май" @@ -11524,15 +11417,12 @@ msgstr "Май" msgid "Media" msgstr "Оповещения" -#: app/controllers/CControllerAuditLogList.php:229 +#: app/controllers/CControllerAuditLogList.php:230 #: app/views/administration.mediatype.edit.php:271 report4.php:96 msgid "Media type" msgstr "Способ оповещений" -#: include/classes/api/services/CMediatype.php:214 -#: include/classes/api/services/CMediatype.php:230 -#: include/classes/api/services/CMediatype.php:509 -#: include/classes/api/services/CMediatype.php:521 +#: include/classes/api/services/CMediatype.php:396 #, c-format msgid "Media type \"%1$s\" already exists." msgstr "Тип медиа \"%1$s\" уже существует." @@ -11562,11 +11452,6 @@ msgstr[0] "Способ оповещения активирован" msgstr[1] "Способы оповещения активированы" msgstr[2] "Способы оповещения активированы" -#: include/classes/api/services/CMediatype.php:197 -#, c-format -msgid "Media type is missing parameters: %1$s" -msgstr "В типе оповещений пропущены параметры: %1$s" - #: app/controllers/CControllerPopupMediatypeTestSend.php:45 #: app/controllers/CControllerPopupMediatypeTestSend.php:145 msgid "Media type test failed." @@ -11584,7 +11469,7 @@ msgstr "Успешное тестирование способа оповеще msgid "Media type updated" msgstr "Способ оповещений обновлен" -#: include/classes/api/services/CUser.php:865 +#: include/classes/api/services/CUser.php:859 #, c-format msgid "Media type with ID \"%1$s\" is not available." msgstr "Способ оповещения с ID \"%1$s\" недоступен." @@ -11596,7 +11481,7 @@ msgstr "Способ оповещения с ID \"%1$s\" недоступен." msgid "Media types" msgstr "Способы оповещений" -#: include/classes/api/services/CMediatype.php:1149 +#: include/classes/api/services/CMediatype.php:809 #, c-format msgid "Media types used by action \"%1$s\"." msgstr "Способы оповещения используются действием \"%1$s\"." @@ -11684,7 +11569,7 @@ msgstr "Сообщения" msgid "Method not found." msgstr "Метод не найден." -#: include/httptest.inc.php:395 +#: include/httptest.inc.php:399 msgid "Microsoft Edge" msgstr "Microsoft Edge" @@ -11746,7 +11631,7 @@ msgid "Minimum severity" msgstr "Минимальная важность" #: app/controllers/CControllerTimeSelectorUpdate.php:244 -#: include/classes/mvc/CController.php:252 +#: include/classes/mvc/CController.php:305 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439 #: include/validate.inc.php:470 #, c-format @@ -11806,7 +11691,7 @@ msgstr "Режим" msgid "Model" msgstr "Модель" -#: app/controllers/CControllerAuditLogList.php:230 +#: app/controllers/CControllerAuditLogList.php:231 #: app/views/administration.module.edit.php:52 msgid "Module" msgstr "Модуль" @@ -11848,7 +11733,7 @@ msgstr[2] "Модулей активировано: %1$s." msgid "Module updated: %1$s." msgstr "Модуль обновлен: %1$s." -#: include/classes/api/services/CRole.php:695 +#: include/classes/api/services/CRole.php:696 #, c-format msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -11874,7 +11759,7 @@ msgstr "Модули обновлены" msgid "Mon" msgstr "Пн" -#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233 +#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214 msgid "Monday" msgstr "Понедельник" @@ -11914,11 +11799,11 @@ msgstr "Месяц" msgid "Monthly" msgstr "Ежемесячно" -#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312 +#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293 msgid "More matches found..." msgstr "Найдено больше совпадений..." -#: jsLoader.php:322 +#: jsLoader.php:303 #, c-format msgctxt "screen reader" msgid "More than %1$d matches for %2$s found" @@ -11942,7 +11827,7 @@ msgstr "" msgid "Most critical of child services" msgstr "" -#: include/httptest.inc.php:405 +#: include/httptest.inc.php:409 msgid "Mozilla Firefox" msgstr "Mozilla Firefox" @@ -11955,7 +11840,7 @@ msgstr "Множественный" msgid "Multiple PROBLEM events" msgstr "Множественные события ПРОБЛЕМА" -#: jsLoader.php:282 +#: jsLoader.php:263 msgid "Mute" msgstr "Отключить звук" @@ -12084,11 +11969,11 @@ msgstr "NTLM" #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:84 #: app/views/popup.massupdate.trigger.php:98 -#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68 -#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270 -#: app/views/popup.services.php:40 app/views/popup.services.php:58 -#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81 -#: app/views/popup.valuemap.edit.php:103 +#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71 +#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279 +#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41 +#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31 +#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44 #: graphs.php:43 host_discovery.php:50 httpconf.php:42 #: include/classes/screens/CScreenHttpTest.php:113 @@ -12246,7 +12131,7 @@ msgstr "Новое условие" msgid "New dashboard" msgstr "Новая панель" -#: jsLoader.php:268 +#: jsLoader.php:249 msgid "New element" msgstr "Новый элемент" @@ -12270,7 +12155,7 @@ msgstr "Новая операция" msgid "New regular expression" msgstr "Новое регулярное выражение" -#: app/controllers/CControllerPopupServiceEdit.php:183 +#: app/controllers/CControllerPopupServiceEdit.php:216 msgid "New service" msgstr "" @@ -12287,7 +12172,7 @@ msgid "New triggers" msgstr "Новые триггера" #: app/views/monitoring.dashboard.view.php:175 -#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181 +#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162 msgid "Next page" msgstr "Следующая страница" @@ -12373,11 +12258,6 @@ msgstr "Не задано \"%1$s\" для графика." msgid "No \"%1$s\" given for map." msgstr "Не указан \"%1$s\" у карты сети." -#: include/classes/api/services/CMediatype.php:453 -#, c-format -msgid "No \"%1$s\" given for media type." -msgstr "Не указан \"%1$s\" у типа оповещений." - #: include/classes/api/services/CAction.php:2655 #: include/classes/api/services/CAction.php:2781 #: include/classes/api/services/CAction.php:2975 @@ -12385,7 +12265,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:1851 +#: include/classes/api/services/CDiscoveryRule.php:1847 #, c-format msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"." msgstr "Не указано \"%2$s\" для условия фильтра правила обнаружения \"%1$s\"." @@ -12395,7 +12275,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:1817 +#: include/classes/api/services/CDiscoveryRule.php:1813 #, c-format msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"." msgstr "Не указано \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"." @@ -12447,7 +12327,7 @@ msgstr "Нет интерфейса по умолчанию для \"%1$s\" ти msgid "No details" msgstr "Без деталей" -#: include/classes/api/services/CDiscoveryRule.php:640 +#: include/classes/api/services/CDiscoveryRule.php:636 msgid "No discovery rule IDs given." msgstr "ID правил обнаружения не указаны." @@ -12483,7 +12363,7 @@ msgstr "" msgid "No graphs added." msgstr "Графики не добавлены." -#: include/classes/api/services/CDiscoveryRule.php:643 +#: include/classes/api/services/CDiscoveryRule.php:639 msgid "No host IDs given." msgstr "Не указаны ID узлов сети." @@ -12513,7 +12393,7 @@ msgstr "Нет изображения" #: app/views/popup.massupdate.item.php:67 #: include/views/configuration.host.discovery.edit.php:493 #: include/views/configuration.item.edit.php:546 -#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369 +#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350 msgid "No interface found" msgstr "Интерфейс не найден" @@ -12547,7 +12427,7 @@ msgstr "Макросы не найдены." msgid "No maps added." msgstr "Карты сети не добавлены." -#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311 +#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292 msgid "No matches found" msgstr "Совпадения не найдены" @@ -12560,8 +12440,8 @@ msgstr "Новые модули не обнаружены" msgid "No operation type given for correlation \"%1$s\"." msgstr "Тип операции не задан для корреляции \"%1$s\"." -#: include/classes/api/services/CUser.php:1550 -#: include/classes/api/services/CUser.php:2054 +#: include/classes/api/services/CUser.php:1544 +#: include/classes/api/services/CUser.php:2048 msgid "No permissions for system access." msgstr "Нет прав доступа в систему." @@ -12573,7 +12453,7 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: app/controllers/CControllerChartsView.php:132 #: app/controllers/CControllerChartsView.php:154 #: app/controllers/CControllerDashboardPrint.php:96 -#: app/controllers/CControllerDashboardShareUpdate.php:93 +#: app/controllers/CControllerDashboardShareUpdate.php:98 #: app/controllers/CControllerDashboardView.php:206 #: app/controllers/CControllerDashboardView.php:254 #: app/controllers/CControllerHintboxActionlist.php:50 @@ -12609,11 +12489,11 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CDashboardGeneral.php:274 #: include/classes/api/services/CDashboardGeneral.php:289 #: include/classes/api/services/CDashboard.php:343 -#: include/classes/api/services/CDiscoveryRule.php:578 -#: include/classes/api/services/CDiscoveryRule.php:619 -#: include/classes/api/services/CDiscoveryRule.php:655 -#: include/classes/api/services/CDiscoveryRule.php:1770 -#: include/classes/api/services/CDiscoveryRule.php:2044 +#: include/classes/api/services/CDiscoveryRule.php:574 +#: include/classes/api/services/CDiscoveryRule.php:615 +#: include/classes/api/services/CDiscoveryRule.php:651 +#: include/classes/api/services/CDiscoveryRule.php:1766 +#: include/classes/api/services/CDiscoveryRule.php:2040 #: include/classes/api/services/CDRule.php:190 #: include/classes/api/services/CDRule.php:316 #: include/classes/api/services/CDRule.php:343 @@ -12628,6 +12508,7 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CGraphPrototype.php:369 #: include/classes/api/services/CGraphPrototype.php:457 #: include/classes/api/services/CGraphPrototype.php:519 +#: include/classes/api/services/CHistory.php:365 #: include/classes/api/services/CHostBase.php:56 #: include/classes/api/services/CHostBase.php:533 #: include/classes/api/services/CHostGeneral.php:66 @@ -12657,12 +12538,10 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CHttpTest.php:602 #: include/classes/api/services/CHttpTest.php:689 #: include/classes/api/services/CHttpTest.php:749 -#: include/classes/api/services/CIconMap.php:285 -#: include/classes/api/services/CIconMap.php:528 -#: include/classes/api/services/CImage.php:364 -#: include/classes/api/services/CImage.php:444 -#: include/classes/api/services/CImage.php:497 -#: include/classes/api/services/CImage.php:513 +#: include/classes/api/services/CIconMap.php:267 +#: include/classes/api/services/CIconMap.php:523 +#: include/classes/api/services/CImage.php:361 +#: include/classes/api/services/CImage.php:412 #: include/classes/api/services/CItemGeneral.php:221 #: include/classes/api/services/CItemGeneral.php:329 #: include/classes/api/services/CItemGeneral.php:344 @@ -12683,27 +12562,29 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CMap.php:1611 #: include/classes/api/services/CMap.php:2056 #: include/classes/api/services/CMap.php:2118 -#: include/classes/api/services/CMediatype.php:478 +#: include/classes/api/services/CMediatype.php:353 +#: include/classes/api/services/CMediatype.php:799 #: include/classes/api/services/CModule.php:214 #: include/classes/api/services/CModule.php:246 #: include/classes/api/services/CProxy.php:388 #: include/classes/api/services/CProxy.php:630 #: include/classes/api/services/CProxy.php:857 #: include/classes/api/services/CRegexp.php:339 -#: include/classes/api/services/CRegexp.php:369 +#: include/classes/api/services/CRegexp.php:368 #: include/classes/api/services/CReport.php:549 #: include/classes/api/services/CReport.php:909 #: include/classes/api/services/CRole.php:314 #: include/classes/api/services/CRole.php:345 -#: include/classes/api/services/CScript.php:540 -#: include/classes/api/services/CScript.php:982 -#: include/classes/api/services/CScript.php:1043 -#: include/classes/api/services/CScript.php:1060 -#: include/classes/api/services/CScript.php:1071 -#: include/classes/api/services/CService.php:389 -#: include/classes/api/services/CService.php:454 -#: include/classes/api/services/CService.php:1713 -#: include/classes/api/services/CService.php:1725 +#: include/classes/api/services/CScript.php:363 +#: include/classes/api/services/CScript.php:842 +#: include/classes/api/services/CScript.php:902 +#: include/classes/api/services/CScript.php:919 +#: include/classes/api/services/CScript.php:931 +#: include/classes/api/services/CService.php:410 +#: include/classes/api/services/CService.php:475 +#: include/classes/api/services/CService.php:895 +#: include/classes/api/services/CService.php:2234 +#: include/classes/api/services/CService.php:2246 #: include/classes/api/services/CTask.php:430 #: include/classes/api/services/CTask.php:477 #: include/classes/api/services/CTemplateDashboard.php:289 @@ -12728,15 +12609,15 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CUserMacro.php:729 #: include/classes/api/services/CUserMacro.php:791 #: include/classes/api/services/CUser.php:542 -#: include/classes/api/services/CUser.php:1245 -#: include/classes/api/services/CUser.php:1773 +#: include/classes/api/services/CUser.php:1239 +#: include/classes/api/services/CUser.php:1767 #: include/classes/api/services/CValueMap.php:299 #: include/classes/api/services/CValueMap.php:408 #: include/classes/api/services/CValueMap.php:514 #: include/classes/helpers/CMapHelper.php:83 #: include/classes/screens/CScreenHistory.php:140 #: include/classes/screens/CScreenHttpTestDetails.php:46 -#: include/func.inc.php:1488 items.php:1240 +#: include/func.inc.php:1488 items.php:1162 msgid "No permissions to referred object or it does not exist!" msgstr "Нет прав доступа к запрашиваемому объекту или он не существует!" @@ -12756,7 +12637,7 @@ msgstr "Файл публичного ключа не указан." msgid "No recipients for action operation message." msgstr "Нет получателей сообщения в операции действия." -#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176 +#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157 msgid "No refresh" msgstr "Не обновлять" @@ -12768,7 +12649,7 @@ msgstr "Не указан скрипт для команды в операции msgid "No target selected" msgstr "Цель не выбрана" -#: graphs.php:396 items.php:1058 +#: graphs.php:396 items.php:1026 msgid "No target selected." msgstr "Цель не выбрана." @@ -12785,7 +12666,7 @@ msgstr "Триггеры не заданы." msgid "No value" msgstr "Значение отсутствует" -#: include/classes/validators/CApiInputValidator.php:1021 +#: include/classes/validators/CApiInputValidator.php:1029 msgid "Non-boolean flags are deprecated." msgstr "Не-логические флаги устарели." @@ -12895,7 +12776,7 @@ msgstr "Без унаследованных элементов данных" msgid "Not supported" msgstr "Не поддерживается" -#: app/views/popup.service.edit.php:219 +#: app/views/popup.service.edit.php:232 #: app/views/popup.service.time.edit.php:123 msgid "Note" msgstr "Заметка" @@ -12926,7 +12807,7 @@ msgstr "Оповещать всех участников" msgid "Nov" msgstr "Нбр." -#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231 +#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212 msgid "November" msgstr "Ноябрь" @@ -13113,8 +12994,8 @@ msgstr "OEM" #: app/views/js/reports.scheduledreport.edit.js.php:77 #: app/views/monitoring.service.list.edit.php:87 #: app/views/monitoring.service.list.php:83 -#: app/views/popup.service.edit.php:192 chart4.php:164 -#: include/classes/helpers/CServiceHelper.php:131 +#: app/views/popup.service.edit.php:205 chart4.php:164 +#: include/classes/helpers/CServiceHelper.php:133 #: include/classes/helpers/CSeverityHelper.php:34 #: include/classes/screens/CScreenHttpTestDetails.php:100 #: include/classes/screens/CScreenHttpTestDetails.php:186 @@ -13174,13 +13055,13 @@ msgstr "Окт" msgid "Octal to decimal" msgstr "Восьмеричное в десятичное" -#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230 +#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211 msgid "October" msgstr "Октябрь" #: app/views/administration.proxy.list.php:156 #: include/views/monitoring.sysmap.constructor.php:51 -#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250 +#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231 msgid "Off" msgstr "Выкл" @@ -13188,11 +13069,11 @@ msgstr "Выкл" #: app/views/js/popup.massupdate.js.php:415 #: app/views/js/popup.mediatypetest.edit.js.php:114 #: app/views/js/popup.scriptexec.js.php:53 -#: app/views/js/reports.auditlog.list.js.php:153 +#: app/views/js/reports.auditlog.list.js.php:157 #: app/views/monitoring.widget.web.view.php:30 #: include/views/configuration.triggers.list.php:94 #: include/views/js/common.item.edit.js.php:334 -#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381 +#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362 #: report2.php:507 msgid "Ok" msgstr "Ok" @@ -13211,7 +13092,7 @@ msgstr "Имя старого тега" #: app/views/administration.proxy.list.php:155 #: include/views/monitoring.sysmap.constructor.php:51 -#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249 +#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230 msgid "On" msgstr "Вкл" @@ -13235,7 +13116,7 @@ msgstr "Один из объектов остался без группы узл msgid "One time only" msgstr "Единовременно" -#: app/partials/service.time.row.php:40 +#: app/views/js/popup.service.edit.js.php:229 #: app/views/popup.service.time.edit.php:48 msgid "One-time downtime" msgstr "Однократная недоступность" @@ -13244,18 +13125,6 @@ msgstr "Однократная недоступность" msgid "Only Super Admins can create host groups." msgstr "Только Супер Администраторы могут создавать группы узлов сети." -#: include/classes/api/services/CMediatype.php:178 -msgid "Only Super Admins can create media types." -msgstr "Только Супер Администраторы могут создавать способы оповещения." - -#: include/classes/api/services/CMediatype.php:1139 -msgid "Only Super Admins can delete media types." -msgstr "Только Супер Администраторы могут удалять способы оповещения." - -#: include/classes/api/services/CMediatype.php:444 -msgid "Only Super Admins can edit media types." -msgstr "Только Супер Администраторы могут менять способы оповещения." - #: include/classes/api/services/CDRule.php:488 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique." msgstr "Только Zabbix агент, SNMPv1, SNMPv2 и SNMPv3 проверки могут быть сделаны уникальными." @@ -13325,7 +13194,7 @@ msgstr "Только супер администраторы могут обно msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Подсчитываются только триггеры у активированных узлов сети и которые зависят от активных элементов данных" -#: include/httptest.inc.php:417 +#: include/httptest.inc.php:421 msgid "Opera" msgstr "Opera" @@ -13334,7 +13203,7 @@ msgstr "Opera" msgid "Operating system information. Returns string" msgstr "Информация об операционной системе. Возвращает строку" -#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68 +#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71 msgid "Operation" msgstr "Операция" @@ -13343,11 +13212,11 @@ msgstr "Операция" msgid "Operation \"%1$s\" already exists." msgstr "Операция \"%1$s\" уже существует." -#: include/classes/mvc/CController.php:164 include/validate.inc.php:308 +#: include/classes/mvc/CController.php:209 include/validate.inc.php:308 msgid "Operation cannot be performed due to unauthorized request." msgstr "Операция не может быть выполнена из-за несанкционированного запроса." -#: jsLoader.php:141 +#: jsLoader.php:122 msgid "Operation details" msgstr "Детали операции" @@ -13513,7 +13382,7 @@ msgstr "Другие параметры настроек" msgid "Other parameters" msgstr "Прочие параметры" -#: include/httptest.inc.php:428 +#: include/httptest.inc.php:432 #: include/views/configuration.httpconf.edit.php:88 msgid "Others" msgstr "Другие" @@ -13556,7 +13425,7 @@ msgid "Override with name \"%1$s\" already exists." msgstr "Замещение с \"%1$s\" именем уже существует." #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402 -#: include/classes/widgets/views/widget.svggraph.form.view.php:296 +#: include/classes/widgets/views/widget.svggraph.form.view.php:297 #: include/views/configuration.host.discovery.edit.php:867 #: include/views/configuration.host.discovery.edit.php:884 msgid "Overrides" @@ -13745,7 +13614,7 @@ msgstr "POP" #: app/views/hintbox.eventlist.php:116 #: app/views/monitoring.widget.problems.view.php:109 -#: include/classes/graph/CSvgGraph.php:1075 +#: include/classes/graph/CSvgGraph.php:1081 #: include/classes/screens/CScreenProblem.php:974 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36 @@ -13790,7 +13659,7 @@ msgstr "PSK" msgid "PSK identity" msgstr "Идентификатор PSK" -#: jsLoader.php:154 +#: jsLoader.php:135 #, c-format msgid "Page %1$d" msgstr "Страница %1$d" @@ -13821,8 +13690,8 @@ msgstr "Параметр" #: include/classes/api/services/CUser.php:349 #: include/classes/api/services/CUser.php:486 #: include/classes/api/services/CUser.php:533 -#: include/classes/api/services/CUser.php:1483 -#: include/classes/validators/CApiInputValidator.php:1086 +#: include/classes/api/services/CUser.php:1477 +#: include/classes/validators/CApiInputValidator.php:1099 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Параметр \"%1$s\" устарел." @@ -13852,7 +13721,7 @@ msgstr "Родительские элементы данных" #: app/partials/monitoring.service.list.edit.php:40 #: app/partials/monitoring.service.list.php:34 -#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57 +#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60 msgid "Parent services" msgstr "" @@ -13869,7 +13738,7 @@ msgstr "Родительские триггеры" msgid "Parent web scenarios" msgstr "Родительские веб-сценарии" -#: include/classes/api/services/CService.php:795 +#: include/classes/api/services/CService.php:1304 #, c-format msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"." msgstr "" @@ -13881,11 +13750,6 @@ msgstr "" msgid "Parse" msgstr "Анализ" -#: include/classes/api/services/CImage.php:218 -#, c-format -msgid "Parse SQL error [%1$s] in [%2$s]." -msgstr "Ошибка разбора SQL [%1$s] в [%2$s]." - #: include/classes/core/CJsonRpc.php:171 msgid "Parse error" msgstr "Ошибка разбора" @@ -13946,7 +13810,7 @@ msgstr "" msgid "Password requirements:" msgstr "" -#: jsLoader.php:177 jsLoader.php:270 +#: jsLoader.php:158 jsLoader.php:251 msgid "Paste" msgstr "Вставить" @@ -13956,11 +13820,11 @@ msgid "Paste page" msgstr "" #: app/views/js/configuration.dashboard.edit.js.php:210 -#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155 +#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136 msgid "Paste widget" msgstr "Вставить виджет" -#: jsLoader.php:271 +#: jsLoader.php:252 msgid "Paste without external links" msgstr "Вставить без внешних связей" @@ -14015,7 +13879,6 @@ msgstr "Выполнение DNS запроса. Возвращает строк #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.prototype.edit.php:654 #: include/views/configuration.maintenance.edit.php:45 report4.php:101 -#: srv_status.php:164 msgid "Period" msgstr "Период" @@ -14104,7 +13967,7 @@ msgstr "Пожалуйста, включите \"allow_url_fopen\" директ msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)." msgstr "Пожалуйста, укажите имя хоста или IP адрес хоста и номер порта Zabbix сервера, а так же имя инсталляции (опционально)." -#: jsLoader.php:259 +#: jsLoader.php:240 msgid "Please select two elements" msgstr "Пожалуйста, выберите два элемента" @@ -14233,7 +14096,7 @@ msgid "Previous month" msgstr "Предыдущий месяц" #: app/views/monitoring.dashboard.view.php:157 -#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182 +#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163 msgid "Previous page" msgstr "Предыдущая страница" @@ -14364,7 +14227,7 @@ msgstr "Проблема не подавлена" msgid "Problem is suppressed" msgstr "Проблема подавлена" -#: jsLoader.php:280 +#: jsLoader.php:261 msgid "Problem on" msgstr "Проблема с" @@ -14377,15 +14240,11 @@ msgstr "Восстановление проблемы" msgid "Problem resolved" msgstr "Проблема решена" -#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286 -#: app/views/popup.services.php:60 +#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296 +#: app/views/popup.services.php:61 msgid "Problem tags" msgstr "" -#: srv_status.php:147 -msgid "Problem time" -msgstr "" - #: app/views/popup.mediatype.message.php:55 #: include/classes/helpers/CMediatypeHelper.php:79 msgid "Problem update" @@ -14405,9 +14264,9 @@ msgstr "Обновление проблемы" #: include/classes/widgets/CWidgetConfig.php:58 #: include/classes/widgets/forms/CWidgetFormProblems.php:35 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35 -#: include/classes/widgets/views/widget.svggraph.form.view.php:295 +#: include/classes/widgets/views/widget.svggraph.form.view.php:296 #: include/views/inventory.host.view.php:151 -#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507 +#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507 msgid "Problems" msgstr "Проблемы" @@ -14441,7 +14300,7 @@ msgid "Prometheus to JSON" msgstr "Prometheus в JSON" #: include/views/monitoring.sysmap.list.php:77 -#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156 +#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137 msgid "Properties" msgstr "Свойства" @@ -14462,7 +14321,7 @@ msgstr "Указанный URL \"%1$s\" ошибочен." msgid "Proxies" msgstr "Прокси" -#: app/controllers/CControllerAuditLogList.php:231 +#: app/controllers/CControllerAuditLogList.php:232 #: app/views/administration.proxy.edit.php:90 #: app/views/administration.proxy.edit.php:143 #: app/views/administration.queue.details.php:49 @@ -14585,7 +14444,7 @@ msgstr "Обзор очереди по прокси" #: app/views/hintbox.eventlist.php:100 #: app/views/monitoring.widget.problems.view.php:93 -#: include/classes/graph/CSvgGraph.php:1071 +#: include/classes/graph/CSvgGraph.php:1077 #: include/classes/screens/CScreenProblem.php:958 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360 msgid "RESOLVED" @@ -14662,10 +14521,6 @@ msgstr "" msgid "Reads modbus data. Returns various types" msgstr "Чтение данных modbus. Возвращает разные типы" -#: srv_status.php:146 -msgid "Reason" -msgstr "" - #: include/actions.inc.php:60 msgid "Received value" msgstr "Полученное значение" @@ -14747,7 +14602,7 @@ msgstr "Прямоугольник" msgid "Refresh" msgstr "Обновить" -#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178 +#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159 msgid "Refresh interval" msgstr "Интервал обновления" @@ -14765,7 +14620,7 @@ msgstr "Сгенерировать заново выбранный API токе msgid "Regular" msgstr "Обычные" -#: app/controllers/CControllerAuditLogList.php:232 +#: app/controllers/CControllerAuditLogList.php:233 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803 #: include/views/configuration.host.discovery.edit.php:687 msgid "Regular expression" @@ -14805,7 +14660,7 @@ msgstr "Регулярные выражения" msgid "Related reports" msgstr "Связанные отчеты" -#: jsLoader.php:163 +#: jsLoader.php:144 msgid "Release to create a widget." msgstr "Отпустите, чтобы создать виджет." @@ -14837,8 +14692,6 @@ msgstr "Удаленная команда" #: app/partials/monitoring.problem.filter.php:191 #: app/partials/monitoring.problem.filter.php:340 #: app/partials/monitoring.problem.filter.php:373 -#: app/partials/service.statusrule.row.php:41 -#: app/partials/service.time.row.php:62 #: app/views/administration.iconmap.edit.php:88 #: app/views/administration.macros.edit.php:76 #: app/views/administration.mediatype.edit.php:111 @@ -14859,7 +14712,9 @@ msgstr "Удаленная команда" #: app/views/js/popup.massupdate.tmpl.js.php:59 #: app/views/js/popup.massupdate.tmpl.js.php:96 #: app/views/js/popup.massupdate.tmpl.js.php:108 -#: app/views/js/popup.service.edit.js.php:46 +#: app/views/js/popup.service.edit.js.php:194 +#: app/views/js/popup.service.edit.js.php:218 +#: app/views/js/popup.service.edit.js.php:237 #: app/views/popup.dashboard.share.edit.php:85 #: app/views/popup.dashboard.share.edit.php:106 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158 @@ -14872,7 +14727,7 @@ msgstr "Удаленная команда" #: app/views/popup.massupdate.template.php:54 #: app/views/popup.massupdate.template.php:136 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45 -#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97 +#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104 #: app/views/popup.valuemap.edit.php:91 #: include/classes/helpers/CTagFilterFieldHelper.php:82 #: include/classes/helpers/CTagFilterFieldHelper.php:135 @@ -14949,8 +14804,8 @@ msgstr "Удаленная команда" #: include/views/monitoring.sysmap.constructor.php:34 #: include/views/monitoring.sysmap.constructor.php:40 #: include/views/monitoring.sysmap.constructor.php:46 -#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198 -#: jsLoader.php:267 +#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179 +#: jsLoader.php:248 msgid "Remove" msgstr "Удалить" @@ -14990,7 +14845,7 @@ msgstr "Удаление, %1$s" msgid "Removed" msgstr "Удалено" -#: jsLoader.php:317 +#: jsLoader.php:298 #, c-format msgctxt "screen reader" msgid "Removed, %1$s" @@ -15087,7 +14942,7 @@ msgstr "Запрос тела" msgid "Request body type" msgstr "Типа запроса тела" -#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146 +#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068 msgid "Request sent successfully" msgstr "Запрос успешно отправлен" @@ -15129,8 +14984,8 @@ msgstr "Требуемые коды состояния" msgid "Required string" msgstr "Требуемая строка" -#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215 -#: include/classes/html/CTabFilter.php:97 +#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50 +#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97 msgid "Reset" msgstr "Сбросить" @@ -15163,7 +15018,7 @@ msgstr "Сбросить подтверждение" msgid "Reset defaults" msgstr "Сбросить по умолчанию" -#: jsLoader.php:281 +#: jsLoader.php:262 msgid "Resolved" msgstr "Решено" @@ -15416,12 +15271,12 @@ msgstr "Выполнение заданной команды на узле се msgid "Russian (ru_RU)" msgstr "Русский (ru_RU)" -#: jsLoader.php:245 +#: jsLoader.php:226 msgctxt "Saturday short" msgid "S" msgstr "Сб" -#: jsLoader.php:246 +#: jsLoader.php:227 msgctxt "Sunday short" msgid "S" msgstr "Вс" @@ -15432,8 +15287,8 @@ msgstr "Настройки SAML" #: app/partials/monitoring.service.list.edit.php:56 #: app/partials/monitoring.service.list.php:53 -#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240 -#: app/views/popup.service.edit.php:315 srv_status.php:149 +#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249 +#: app/views/popup.service.edit.php:354 msgid "SLA" msgstr "SLA" @@ -15566,12 +15421,12 @@ msgstr "SQL запросов: %1$s (selects: %2$s | executes: %3$s)" msgid "SQL query" msgstr "SQL запрос" -#: include/classes/db/DB.php:946 +#: include/classes/db/DB.php:975 #, c-format msgid "SQL statement execution has failed \"%1$s\"" msgstr "Ошибка при выполнении SQL запроса \"%1$s\"" -#: include/classes/db/DB.php:614 include/classes/db/DB.php:673 +#: include/classes/db/DB.php:643 include/classes/db/DB.php:702 #, c-format msgid "SQL statement execution has failed \"%1$s\"." msgstr "Ошибка при выполнении SQL запроса \"%1$s\"." @@ -15634,7 +15489,7 @@ msgstr "URL единого входа" msgid "STARTTLS" msgstr "STARTTLS" -#: include/httptest.inc.php:422 +#: include/httptest.inc.php:426 msgid "Safari" msgstr "Safari" @@ -15646,7 +15501,7 @@ msgstr "Sans-Serif" msgid "Sat" msgstr "Сб" -#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238 +#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219 msgid "Saturday" msgstr "Суббота" @@ -15688,7 +15543,7 @@ msgstr "Запланировано" msgid "Scheduled check" msgstr "Запланированная проверка" -#: app/controllers/CControllerAuditLogList.php:234 +#: app/controllers/CControllerAuditLogList.php:235 #: app/views/reports.scheduledreport.edit.php:58 msgid "Scheduled report" msgstr "Регулярный отчет" @@ -15758,7 +15613,7 @@ msgctxt "selected problems" msgid "Scope" msgstr "Границы" -#: app/controllers/CControllerAuditLogList.php:235 +#: app/controllers/CControllerAuditLogList.php:236 #: app/views/administration.mediatype.edit.php:218 #: app/views/administration.script.edit.php:116 #: app/views/administration.script.edit.php:186 @@ -15771,8 +15626,7 @@ msgstr "Границы" msgid "Script" msgstr "Скрипт" -#: include/classes/api/services/CScript.php:320 -#: include/classes/api/services/CScript.php:561 +#: include/classes/api/services/CScript.php:1328 #, c-format msgid "Script \"%1$s\" already exists." msgstr "Скрипт \"%1$s\" уже существует." @@ -15805,12 +15659,6 @@ msgstr "Имя скрипта" msgid "Script parameters" msgstr "Параметры скрипта" -#: include/classes/api/services/CMediatype.php:341 -#: include/classes/api/services/CMediatype.php:667 -#, c-format -msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"." -msgstr "Пропущен символ новой строки в параметрах скрипта \"%1$s\" для типа оповещений \"%2$s\"." - #: include/classes/debug/CProfiler.php:145 msgid "Script profiler" msgstr "Профилировщик сценария" @@ -15823,7 +15671,7 @@ msgstr "Скрипт обновлен" #: app/views/administration.script.edit.php:31 #: app/views/administration.script.list.php:31 #: include/classes/helpers/CMenuHelper.php:295 -#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355 +#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336 msgid "Scripts" msgstr "Скрипты" @@ -15894,7 +15742,7 @@ msgstr "Имя безопасности" #: app/views/monitoring.widget.navtreeitem.edit.php:48 #: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638 -#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93 +#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:371 #: include/views/configuration.graph.edit.php:207 @@ -15902,7 +15750,7 @@ msgstr "Имя безопасности" #: include/views/configuration.item.edit.php:101 #: include/views/configuration.item.prototype.edit.php:83 #: include/views/configuration.item.prototype.edit.php:479 -#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315 +#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296 msgid "Select" msgstr "Выбрать" @@ -15938,19 +15786,19 @@ msgstr "Выбранные элементы" msgid "Selected items only" msgstr "Только выбранные элементы данных" -#: jsLoader.php:320 +#: jsLoader.php:301 #, c-format msgctxt "screen reader" msgid "Selected, %1$s in position %2$d of %3$d" msgstr "Выбран, %1$s в позиции %2$d из %3$d" -#: jsLoader.php:321 +#: jsLoader.php:302 #, c-format msgctxt "screen reader" msgid "Selected, %1$s, read only, in position %2$d of %3$d" msgstr "Выбран, %1$s, только чтение, в позиции %2$d из %3$d" -#: jsLoader.php:265 +#: jsLoader.php:246 msgid "Send backward" msgstr "Переместить назад" @@ -15975,7 +15823,7 @@ msgstr "Отправка только через" msgid "Send to" msgstr "Отправлять на" -#: jsLoader.php:266 +#: jsLoader.php:247 msgid "Send to back" msgstr "На задний план" @@ -16008,7 +15856,7 @@ msgstr "Раздельно" msgid "Separately" msgstr "Раздельно" -#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229 +#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210 msgid "September" msgstr "Сентябрь" @@ -16039,28 +15887,28 @@ msgstr "Сервер (прокси)" msgid "Server time" msgstr "Время на сервере" -#: app/controllers/CControllerAuditLogList.php:223 -#: app/controllers/CControllerPopupServiceEdit.php:146 +#: app/controllers/CControllerAuditLogList.php:224 +#: app/controllers/CControllerPopupServiceEdit.php:179 #: app/views/monitoring.service.list.edit.php:115 #: app/views/popup.mediatype.message.php:58 -#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314 +#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353 #: include/actions.inc.php:67 include/actions.inc.php:77 -#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144 +#: include/classes/helpers/CMediatypeHelper.php:96 msgid "Service" msgstr "Услуга" -#: include/classes/api/services/CService.php:872 +#: include/classes/api/services/CService.php:1381 #, c-format msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point." msgstr "" -#: include/classes/api/services/CService.php:926 -#: include/classes/api/services/CService.php:960 +#: include/classes/api/services/CService.php:1435 +#: include/classes/api/services/CService.php:1469 #, c-format msgid "Service \"%1$s\" cannot have problem tags and children at the same time." msgstr "" -#: include/classes/api/services/CService.php:899 +#: include/classes/api/services/CService.php:1408 #, c-format msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule." msgstr "" @@ -16070,7 +15918,7 @@ msgstr "" msgid "Service actions" msgstr "" -#: app/controllers/CControllerServiceCreate.php:169 +#: app/controllers/CControllerServiceCreate.php:173 msgid "Service created" msgstr "Услуга создана" @@ -16104,8 +15952,8 @@ msgstr "Порт сервиса" msgid "Service recovery" msgstr "" -#: app/controllers/CControllerServiceTimeValidate.php:92 -#: include/classes/api/services/CService.php:1085 +#: app/controllers/CControllerServiceTimeValidate.php:96 +#: include/classes/api/services/CService.php:1603 msgid "Service start time must be less than end time." msgstr "Время начала должно быть меньше чем время окончания." @@ -16121,7 +15969,7 @@ msgstr "" msgid "Service time" msgstr "" -#: app/views/popup.service.edit.php:249 +#: app/views/popup.service.edit.php:258 msgid "Service times" msgstr "Интервалы времени услуги" @@ -16134,30 +15982,29 @@ msgstr "Тип сервиса" msgid "Service update" msgstr "" -#: app/controllers/CControllerServiceUpdate.php:185 +#: app/controllers/CControllerServiceUpdate.php:189 msgid "Service updated" msgstr "Услуга обновлена" -#: include/classes/api/services/CRole.php:520 +#: include/classes/api/services/CRole.php:518 #, c-format msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"." msgstr "" -#: app/controllers/CControllerServiceListEdit.php:191 -#: app/controllers/CControllerServiceListEditRefresh.php:146 -#: app/controllers/CControllerServiceList.php:165 -#: app/controllers/CControllerServiceListRefresh.php:128 +#: app/controllers/CControllerServiceListEdit.php:177 +#: app/controllers/CControllerServiceListEditRefresh.php:151 +#: app/controllers/CControllerServiceList.php:151 +#: app/controllers/CControllerServiceListRefresh.php:133 #: app/views/administration.housekeeping.edit.php:95 #: app/views/monitoring.service.list.edit.php:130 #: app/views/monitoring.service.list.php:105 #: app/views/popup.condition.common.php:643 #: include/classes/helpers/CMenuHelper.php:74 -#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26 -#: srv_status.php:155 +#: include/classes/helpers/CRoleHelper.php:319 msgid "Services" msgstr "Услуги" -#: include/classes/api/services/CService.php:1010 +#: include/classes/api/services/CService.php:1528 msgid "Services form a circular dependency." msgstr "Услуги образуют круговую зависимость." @@ -16165,13 +16012,13 @@ msgstr "Услуги образуют круговую зависимость." msgid "Services updated" msgstr "" -#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503 +#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468 msgid "Session initialization error." msgstr "Ошибка инициализации сессии." -#: include/classes/api/services/CUser.php:1696 -#: include/classes/api/services/CUser.php:1710 -#: include/classes/api/services/CUser.php:1735 +#: include/classes/api/services/CUser.php:1690 +#: include/classes/api/services/CUser.php:1704 +#: include/classes/api/services/CUser.php:1729 msgid "Session terminated, re-login, please." msgstr "Сессия завершена, пожалуйста, зайдите повторно в систему." @@ -16195,7 +16042,7 @@ msgstr "Задать дату и время срока действия" msgid "Set host inventory mode" msgstr "Задать режим инвентарных данных узлов сети" -#: include/classes/html/CInputSecret.php:80 jsLoader.php:387 +#: include/classes/html/CInputSecret.php:80 jsLoader.php:368 msgid "Set new value" msgstr "Задать новое значение" @@ -16224,7 +16071,7 @@ msgstr "Не удалось задать LDAP протокол." msgid "Setting LDAP referrals to \"Off\" failed." msgstr "Не удалось задать LDAP referral значением \"Off\"." -#: app/controllers/CControllerAuditLogList.php:236 +#: app/controllers/CControllerAuditLogList.php:237 msgid "Settings" msgstr "Настройки" @@ -16289,7 +16136,7 @@ msgstr "Фигура" msgid "Shared" msgstr "Общий доступ" -#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341 +#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322 msgid "Sharing" msgstr "Общий доступ" @@ -16431,7 +16278,7 @@ msgstr "Показывать предупреждение, если Zabbix се msgid "Show working time" msgstr "Отображать рабочее время" -#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252 +#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233 msgid "Shown" msgstr "Отображено" @@ -16540,7 +16387,7 @@ msgstr "Пропущено копирование графика \"%1$s\" в у msgid "Slovak (sk_SK)" msgstr "Slovak (sk_SK)" -#: jsLoader.php:286 +#: jsLoader.php:267 msgid "Snooze" msgstr "Заснуть" @@ -16586,7 +16433,7 @@ msgstr "Некоторые данные истории этого элемент msgid "Sort entries by" msgstr "Сортировка записей по" -#: app/views/popup.service.edit.php:106 +#: app/views/popup.service.edit.php:113 msgid "Sort order (0->999)" msgstr "Порядок сортировки (0->999)" @@ -16660,7 +16507,7 @@ msgstr "Начинать в" #: app/views/monitoring.dashboard.view.php:164 #: app/views/monitoring.dashboard.view.php:232 #: app/views/monitoring.host.dashboard.view.php:101 -#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157 +#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138 msgid "Start slideshow" msgstr "Начать слайд-шоу" @@ -16763,15 +16610,19 @@ msgstr "Статистика и доступность кэша записи в #: include/views/configuration.item.list.php:92 #: include/views/configuration.item.list.php:171 #: include/views/configuration.triggers.list.php:82 -#: include/views/configuration.triggers.list.php:195 srv_status.php:145 +#: include/views/configuration.triggers.list.php:195 msgid "Status" msgstr "Состояние" -#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285 -#: app/views/popup.services.php:59 +#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295 +#: app/views/popup.services.php:60 msgid "Status calculation rule" msgstr "" +#: app/views/popup.service.edit.php:126 +msgid "Status calculation rule and additional rules are only applicable if child services exist." +msgstr "" + #: include/views/configuration.httpconf.edit.php:206 msgid "Status codes" msgstr "Коды состояний" @@ -16801,7 +16652,7 @@ msgstr "Только состояние" msgid "Status problem" msgstr "Состояние проблемы" -#: app/views/popup.service.edit.php:166 +#: app/views/popup.service.edit.php:179 msgid "Status propagation rule" msgstr "" @@ -16849,7 +16700,7 @@ msgstr "Остановка обработки" #: app/views/monitoring.dashboard.view.php:163 #: app/views/monitoring.dashboard.view.php:233 #: app/views/monitoring.host.dashboard.view.php:100 -#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158 +#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139 msgid "Stop slideshow" msgstr "Остановить слайд-шоу" @@ -16914,7 +16765,7 @@ msgctxt "encryption certificate" msgid "Subject" msgstr "Субъект" -#: jsLoader.php:356 +#: jsLoader.php:337 msgid "Submap" msgstr "Подкарта" @@ -16930,7 +16781,7 @@ msgstr "Подписки" msgid "Success Audit" msgstr "Аудит успеха" -#: include/func.inc.php:1641 jsLoader.php:215 +#: include/func.inc.php:1641 jsLoader.php:196 msgid "Success message" msgstr "Сообщение об успехе" @@ -16943,7 +16794,7 @@ msgstr "Суммарная статистика входящего и исход msgid "Sun" msgstr "Вс" -#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239 +#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220 msgid "Sunday" msgstr "Воскресенье" @@ -17035,12 +16886,12 @@ msgstr "" msgid "System uptime in seconds. Returns integer" msgstr "Системное время в секундах. Возвращает число" -#: jsLoader.php:243 +#: jsLoader.php:224 msgctxt "Thursday short" msgid "T" msgstr "Чт" -#: jsLoader.php:241 +#: jsLoader.php:222 msgctxt "Tuesday short" msgid "T" msgstr "Вт" @@ -17067,7 +16918,7 @@ msgstr "ИСТИНА" msgid "Table \"%1$s\" does not exist." msgstr "Таблица \"%1$s\" не существует." -#: include/classes/db/DB.php:477 +#: include/classes/db/DB.php:497 #, c-format msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"." msgstr "У таблицы \"%1$s\" нет поля с названием \"%2$s\"." @@ -17133,7 +16984,7 @@ msgstr "Значение тега" #: app/views/popup.massupdate.template.php:149 #: app/views/popup.massupdate.trigger.php:75 #: app/views/popup.massupdate.trigger.php:150 -#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316 +#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117 #: include/classes/screens/CScreenProblem.php:839 #: include/classes/screens/CScreenProblem.php:895 @@ -17193,7 +17044,7 @@ msgstr "Тип цели" msgid "Telnet" msgstr "Telnet" -#: app/controllers/CControllerAuditLogList.php:237 +#: app/controllers/CControllerAuditLogList.php:238 #: app/views/administration.mediatype.edit.php:281 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274 #: include/actions.inc.php:49 include/forms.inc.php:529 @@ -17238,7 +17089,7 @@ msgstr "Свойства шаблона и узла сети, которые н msgid "Template cannot be linked to another template more than once even through other templates." msgstr "Шаблон не может быть соединен с другим шаблоном несколько раз, даже через другие шаблоны." -#: app/controllers/CControllerAuditLogList.php:238 +#: app/controllers/CControllerAuditLogList.php:239 msgid "Template dashboard" msgstr "Шаблон панели" @@ -17470,7 +17321,7 @@ msgstr "Узел сети более не обнаруживается и буд msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed." msgstr "Узел сети более не обнаруживается и будет удален при следующем выполнении правила обнаружения." -#: include/classes/api/services/CImage.php:383 +#: include/classes/api/services/CImage.php:555 #, c-format msgid "The image is used in icon map %1$s." msgid_plural "The image is used in icon maps %1$s." @@ -17478,7 +17329,7 @@ msgstr[0] "Изображение используется в соответст msgstr[1] "Изображение используется в соответствиях иконок %1$s." msgstr[2] "Изображение используется в соответствиях иконок %1$s." -#: include/classes/api/services/CImage.php:409 +#: include/classes/api/services/CImage.php:591 #, c-format msgid "The image is used in map %1$s." msgid_plural "The image is used in maps %1$s." @@ -17544,7 +17395,7 @@ msgstr "Это поле автоматически заполняется \"%1$s msgid "This is the test message from Zabbix" msgstr "Это тестовое сообщение от Zabbix" -#: include/func.inc.php:2552 srv_status.php:40 +#: include/func.inc.php:2552 msgid "This month" msgstr "Этот месяц" @@ -17552,7 +17403,7 @@ msgstr "Этот месяц" msgid "This month so far" msgstr "В этом месяце" -#: include/func.inc.php:2550 srv_status.php:39 +#: include/func.inc.php:2550 msgid "This week" msgstr "Эта неделя" @@ -17560,7 +17411,7 @@ msgstr "Эта неделя" msgid "This week so far" msgstr "На этой неделе" -#: include/func.inc.php:2554 srv_status.php:41 +#: include/func.inc.php:2554 msgid "This year" msgstr "Этот год" @@ -17580,7 +17431,7 @@ msgstr "Троттлинг" msgid "Thu" msgstr "Чт" -#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236 +#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217 msgid "Thursday" msgstr "Четверг" @@ -17630,7 +17481,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces msgstr "Время последнего обращения прокси. Имя - имя прокси. Допустимые параметры: lastaccess - штамп времени в Unix формате, задержка - секунды." #: include/actions.inc.php:51 -#: include/classes/widgets/views/widget.svggraph.form.view.php:292 +#: include/classes/widgets/views/widget.svggraph.form.view.php:293 msgid "Time period" msgstr "Период времени" @@ -17682,12 +17533,11 @@ msgstr "Отметка времени" msgid "To" msgstr "К" -#: jsLoader.php:368 +#: jsLoader.php:349 msgid "To set a host interface select a single item type for all items" msgstr "Чтобы задать интерфейс узла сети выберите один тип элемента данных из всех элементов данных" #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548 -#: srv_status.php:38 msgid "Today" msgstr "Сегодня" @@ -17802,7 +17652,7 @@ msgstr "Период хранения динамики изменений" msgid "Trends" msgstr "Динамика изменений" -#: app/controllers/CControllerAuditLogList.php:239 +#: app/controllers/CControllerAuditLogList.php:240 #: app/controllers/CControllerPopupTriggerWizard.php:282 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256 @@ -17810,7 +17660,7 @@ msgstr "Динамика изменений" #: include/views/configuration.triggers.edit.php:571 #: include/views/js/monitoring.sysmaps.js.php:94 #: include/views/js/monitoring.sysmaps.js.php:792 -#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357 +#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338 msgid "Trigger" msgstr "Триггер" @@ -17914,7 +17764,7 @@ msgstr "Имя триггера" msgid "Trigger overview" msgstr "Обзор триггеров" -#: app/controllers/CControllerAuditLogList.php:240 +#: app/controllers/CControllerAuditLogList.php:241 #: app/views/popup.lldoperation.php:52 #: app/views/popup.massupdate.trigger.php:149 #: include/views/configuration.trigger.prototype.edit.php:548 @@ -17988,11 +17838,11 @@ msgstr "Прототипы триггеров обновлены" msgid "Trigger severity" msgstr "Важность триггеров" -#: jsLoader.php:342 +#: jsLoader.php:323 msgid "Trigger status \"OK\"" msgstr "Состояние триггера \"ОК\"" -#: jsLoader.php:343 +#: jsLoader.php:324 msgid "Trigger status \"Problem\"" msgstr "Состояние триггера \"Проблема\"" @@ -18044,7 +17894,7 @@ msgstr "Обрезать" msgid "Tue" msgstr "Вт" -#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234 +#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215 msgid "Tuesday" msgstr "Вторник" @@ -18057,7 +17907,7 @@ msgstr "Турецкий (tr_TR)" 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\" инвентарных данных узла сети, это может привести к конфликту." -#: jsLoader.php:260 +#: jsLoader.php:241 msgid "Two map elements should be selected" msgstr "Необходимо выбрать два элемента карты" @@ -18080,7 +17930,7 @@ msgstr "Необходимо выбрать два элемента карты" #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114 #: app/views/popup.massupdate.item.php:48 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70 -#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47 +#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51 #: include/classes/widgets/CWidgetHelper.php:50 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33 @@ -18137,7 +17987,7 @@ msgstr "Тип информации" msgid "Types" msgstr "Типы" -#: include/classes/api/services/CRole.php:461 +#: include/classes/api/services/CRole.php:460 #, c-format msgid "UI element \"%2$s\" is not available for user role \"%1$s\"." msgstr "" @@ -18158,7 +18008,7 @@ msgstr "НЕИЗВЕСТНО" #: include/views/configuration.trigger.prototype.edit.php:530 #: include/views/configuration.triggers.edit.php:557 #: include/views/js/monitoring.sysmaps.js.php:314 -#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358 +#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339 msgid "URL" msgstr "URL" @@ -18204,12 +18054,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"." msgstr "URL должно быть с обоими полями \"name\" и \"url\" у карты сети \"%1$s\"." #: include/views/js/monitoring.sysmaps.js.php:311 -#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359 +#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340 msgid "URLs" msgstr "URLы" -#: include/classes/validators/CApiInputValidator.php:2435 -#: include/classes/validators/CApiInputValidator.php:2441 +#: include/classes/validators/CApiInputValidator.php:2448 +#: include/classes/validators/CApiInputValidator.php:2454 msgid "UUIDv4 is expected" msgstr "Ожидается UUIDv4" @@ -18294,12 +18144,12 @@ msgstr "Разблокировать" msgid "Unblock selected users?" msgstr "Разблокировать выбранных пользователей?" -#: include/classes/core/ZBase.php:606 +#: include/classes/core/ZBase.php:571 #, c-format msgid "Unexpected response for action %1$s." msgstr "Неожиданный ответ для действия %1$s." -#: app/views/js/popup.service.edit.js.php:383 +#: app/views/js/popup.service.edit.js.php:582 #: app/views/js/popup.service.statusrule.edit.js.php:104 #: app/views/js/popup.service.time.edit.js.php:82 msgid "Unexpected server error." @@ -18404,7 +18254,7 @@ msgstr "Отсоединить от шаблона" msgid "Unlink from templates" msgstr "Отсоединить от шаблонов" -#: jsLoader.php:284 +#: jsLoader.php:265 msgid "Unmute" msgstr "Включить звук" @@ -18436,7 +18286,7 @@ msgstr "Неподдерживаемая операция." msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для действия условия фильтра \"%1$s\"." -#: include/classes/api/services/CDiscoveryRule.php:1852 +#: include/classes/api/services/CDiscoveryRule.php:1848 #, c-format msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для правила обнаружения условия фильтра \"%1$s\"." @@ -18446,7 +18296,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:1818 +#: include/classes/api/services/CDiscoveryRule.php:1814 #, c-format msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"." @@ -18504,7 +18354,7 @@ msgstr "Доступен" #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127 #: app/views/popup.mediatype.message.php:104 #: app/views/popup.scheduledreport.subscription.php:133 -#: app/views/popup.service.edit.php:339 +#: app/views/popup.service.edit.php:385 #: app/views/popup.service.statusrule.edit.php:98 #: app/views/popup.service.time.edit.php:167 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126 @@ -18557,7 +18407,7 @@ msgstr "Операции обновления" msgid "Update problem" msgstr "Обновление проблемы" -#: app/controllers/CControllerAuditLogList.php:361 +#: app/controllers/CControllerAuditLogList.php:362 #: app/controllers/CControllerPopupImportCompare.php:160 msgid "Updated" msgstr "Обновлено" @@ -18575,7 +18425,7 @@ msgstr "Загрузить" msgid "Upper level maps" msgstr "Карты верхнего уровня" -#: app/partials/service.time.row.php:28 +#: app/views/js/popup.service.edit.js.php:225 #: app/views/popup.service.time.edit.php:46 #: include/classes/screens/CScreenDiscovery.php:120 msgid "Uptime" @@ -18610,7 +18460,7 @@ msgstr "Использовать sandbox атрибут в iframe" msgid "Used in actions" msgstr "Использование в действиях" -#: app/controllers/CControllerAuditLogList.php:241 +#: app/controllers/CControllerAuditLogList.php:242 #: app/partials/js/scheduledreport.subscription.js.php:78 #: app/partials/popup.operations.php:105 #: app/views/administration.token.edit.php:51 @@ -18630,32 +18480,32 @@ msgstr "Пользователь" msgid "User \"%1$s\" cannot be without user group." msgstr "Пользователь \"%1$s\" не может быть без группы пользователей." -#: include/classes/api/services/CUser.php:1331 +#: include/classes/api/services/CUser.php:1325 #, c-format msgid "User \"%1$s\" is dashboard \"%2$s\" owner." msgstr "Пользователь \"%1$s\" владелец панели \"%2$s\"." -#: include/classes/api/services/CUser.php:1316 +#: include/classes/api/services/CUser.php:1310 #, c-format msgid "User \"%1$s\" is map \"%2$s\" owner." msgstr "Пользователь \"%1$s\" является владельцем \"%2$s\" карты сети." -#: include/classes/api/services/CUser.php:1354 +#: include/classes/api/services/CUser.php:1348 #, c-format msgid "User \"%1$s\" is report \"%2$s\" owner." msgstr "Пользователь \"%1$s\" является владельцем \"%2$s\" отчета." -#: include/classes/api/services/CUser.php:1362 +#: include/classes/api/services/CUser.php:1356 #, c-format msgid "User \"%1$s\" is report \"%2$s\" recipient." msgstr "Пользователь \"%1$s\" является получателем \"%2$s\" отчета." -#: include/classes/api/services/CUser.php:1302 +#: include/classes/api/services/CUser.php:1296 #, c-format msgid "User \"%1$s\" is used in \"%2$s\" action." msgstr "Пользователь \"%1$s\" используется в \"%2$s\" действии." -#: include/classes/api/services/CUser.php:1375 +#: include/classes/api/services/CUser.php:1369 #, c-format msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "Пользователь \"%1$s\" является пользователем от имени которого создан \"%2$s\" шаблон." @@ -18678,12 +18528,12 @@ msgid "User agent string" msgstr "Строка user agent" #: include/classes/api/services/CUserGroup.php:545 -#: include/classes/api/services/CUser.php:979 +#: include/classes/api/services/CUser.php:973 msgid "User cannot add himself to a disabled group or a group with disabled GUI access." msgstr "Пользователь не может добавить себя в отключенную группу или в группу с отключенным доступом к Веб-интерфейсу." #: app/views/administration.user.edit.php:411 -#: include/classes/api/services/CUser.php:966 +#: include/classes/api/services/CUser.php:960 msgid "User cannot change own role." msgstr "Пользователь не может изменить свою роль." @@ -18698,7 +18548,7 @@ msgstr[0] "Пользователь удален" msgstr[1] "Пользователи удалены" msgstr[2] "Пользователи удалены" -#: app/controllers/CControllerAuditLogList.php:242 +#: app/controllers/CControllerAuditLogList.php:243 #: app/partials/js/scheduledreport.subscription.js.php:83 #: app/partials/popup.operations.php:85 #: app/views/administration.script.edit.php:242 @@ -18764,9 +18614,9 @@ msgstr[2] "Группы пользователей обновлены" #: include/classes/api/services/CDashboard.php:482 #: include/classes/api/services/CReport.php:463 -#: include/classes/api/services/CScript.php:901 +#: include/classes/api/services/CScript.php:764 #: include/classes/api/services/CSettings.php:249 -#: include/classes/api/services/CUser.php:741 +#: include/classes/api/services/CUser.php:735 #, c-format msgid "User group with ID \"%1$s\" is not available." msgstr "Группа пользователей с ID \"%1$s\" недоступна." @@ -18781,7 +18631,7 @@ msgstr "Группа пользователей с ID \"%1$s\" недоступ msgid "User groups" msgstr "Группы пользователей" -#: include/classes/api/services/CUser.php:1252 +#: include/classes/api/services/CUser.php:1246 msgid "User is not allowed to delete himself." msgstr "Пользователю не разрешается удалять самого себя." @@ -18809,7 +18659,7 @@ msgstr "Пароль пользователя" msgid "User profile" msgstr "Профиль пользователя" -#: app/controllers/CControllerAuditLogList.php:243 +#: app/controllers/CControllerAuditLogList.php:244 #: app/views/administration.user.list.php:110 #: app/views/administration.userrole.edit.php:386 #: app/views/administration.userrole.edit.php:388 @@ -18836,7 +18686,7 @@ msgstr[2] "Роли пользователей удалены" msgid "User role updated" msgstr "Роль пользователя обновлена" -#: include/classes/api/services/CUser.php:796 +#: include/classes/api/services/CUser.php:790 #, c-format msgid "User role with ID \"%1$s\" is not available." msgstr "Роль пользователя с ID \"%1$s\" недоступна." @@ -18892,7 +18742,7 @@ msgstr "Пользователь обновлен" msgid "User with ID \"%1$s\" is not available." msgstr "Пользователь с ID \"%1$s\" недоступен." -#: include/classes/api/services/CUser.php:700 +#: include/classes/api/services/CUser.php:694 #, c-format msgid "User with username \"%1$s\" already exists." msgstr "Пользователь с именем пользователя \"%1$s\" уже существует." @@ -19220,7 +19070,7 @@ msgstr "Валидация" #: app/views/popup.massupdate.service.php:50 #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:84 -#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270 +#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309 #: include/classes/screens/CScreenHistory.php:279 @@ -19262,7 +19112,7 @@ msgstr "Значение \"%1$s\" является недопустимым дл msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"." msgstr "Значение \"%1$s\" является недопустимым для параметра \"grid_show\". Варианты: \"%2$s\"." -#: include/classes/db/DB.php:390 include/classes/db/DB.php:419 +#: include/classes/db/DB.php:390 include/classes/db/DB.php:423 #, c-format msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters." msgstr "Значение \"%1$s\" является слишком длинным для поля \"%2$s\" - %3$d символов. Допустимая длина %4$d символов." @@ -19279,7 +19129,7 @@ msgstr "Статистика кэша значений. Допустимые з msgid "Value cannot be empty." msgstr "Значение не может быть пустым" -#: app/controllers/CControllerAuditLogList.php:244 +#: app/controllers/CControllerAuditLogList.php:245 msgid "Value map" msgstr "Преобразование значений" @@ -19373,7 +19223,7 @@ msgstr "API endpoint Хранилища" msgid "Vault authentication token" msgstr "Токен аутентификации Хранилища" -#: include/classes/core/ZBase.php:234 +#: include/classes/core/ZBase.php:228 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53 msgid "Vault connection failed." msgstr "Ошибка подключения к Хранилищу." @@ -19460,7 +19310,7 @@ msgstr "Видимое имя не может быть пустым, если и msgid "W" msgstr "" -#: jsLoader.php:242 +#: jsLoader.php:223 msgctxt "Wednesday short" msgid "W" msgstr "Ср" @@ -19477,7 +19327,7 @@ msgctxt "setup" msgid "Warning" msgstr "Предупреждение" -#: include/func.inc.php:1643 jsLoader.php:217 +#: include/func.inc.php:1643 jsLoader.php:198 msgid "Warning message" msgstr "Предупреждающее сообщение" @@ -19486,7 +19336,7 @@ msgstr "Предупреждающее сообщение" msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)" msgstr "Внимание! Ваш сервер базы данных версии %1$s слишком старый. Необходима как минимум версия %2$s" -#: jsLoader.php:289 +#: jsLoader.php:270 msgid "We are sorry, the maximum possible number of elements to remember has been reached." msgstr "Приносим свои извинения, достигнуто максимально возможное количество элементов." @@ -19502,7 +19352,7 @@ msgstr "Приносим свои извинения, достигнуто ма #: include/views/inventory.host.view.php:136 #: include/views/inventory.host.view.php:141 #: include/views/inventory.host.view.php:206 -#: include/views/inventory.host.view.php:219 jsLoader.php:360 +#: include/views/inventory.host.view.php:219 jsLoader.php:341 msgid "Web" msgstr "Веб" @@ -19514,7 +19364,7 @@ msgstr "Веб" msgid "Web monitoring" msgstr "Веб-мониторинг" -#: app/controllers/CControllerAuditLogList.php:233 +#: app/controllers/CControllerAuditLogList.php:234 msgid "Web scenario" msgstr "Веб-сценарий" @@ -19529,29 +19379,29 @@ msgstr "Веб-сценарий \"%1$s\" уже существует у узла msgid "Web scenario \"%1$s\" already exists." msgstr "Веб-сценарий \"%1$s\" уже существует." -#: httpconf.php:227 +#: httpconf.php:199 msgid "Web scenario added" msgstr "Веб-сценарий добавлен" -#: httpconf.php:179 httpconf.php:502 +#: httpconf.php:179 httpconf.php:444 msgid "Web scenario deleted" msgstr "Веб-сценарий удален" -#: httpconf.php:443 +#: httpconf.php:415 msgid "Web scenario disabled" msgid_plural "Web scenarios disabled" msgstr[0] "Веб-сценарий деактивирован" msgstr[1] "Веб-сценарии деактивированы" msgstr[2] "Веб-сценарии деактивированы" -#: httpconf.php:442 +#: httpconf.php:414 msgid "Web scenario enabled" msgid_plural "Web scenarios enabled" msgstr[0] "Веб-сценарий активирован" msgstr[1] "Веб-сценарии активированы" msgstr[2] "Веб-сценарии активированы" -#: httpconf.php:223 +#: httpconf.php:195 msgid "Web scenario updated" msgstr "Веб-сценарий обновлен" @@ -19573,7 +19423,7 @@ msgstr "Webhook не содержит параметров." msgid "Wed" msgstr "Ср" -#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235 +#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216 msgid "Wednesday" msgstr "Среда" @@ -19584,7 +19434,7 @@ msgstr "Среда" msgid "Weekly" msgstr "Еженедельно" -#: app/views/popup.service.edit.php:204 +#: app/views/popup.service.edit.php:217 msgid "Weight" msgstr "" @@ -19605,7 +19455,7 @@ msgstr "Когда активен" msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds." msgstr "Виджет по X:%3$d, Y:%4$d на странице #%2$d панели \"%1$s\" выходит за границы." -#: jsLoader.php:184 +#: jsLoader.php:165 msgid "Widget is too small for the specified number of columns and rows." msgstr "Виджет слишком маленький для указанного количества колонок и строк." @@ -19800,6 +19650,10 @@ msgstr "d.m.Y H:i" msgid "Y-m-d H:i:s" msgstr "d.m.Y H:i:s" +#: include/translateDefines.inc.php:37 +msgid "Y-n-d" +msgstr "" + #: include/views/js/monitoring.sysmaps.js.php:446 msgid "Y1" msgstr "Y1" @@ -19921,15 +19775,10 @@ msgstr "Вы не указали цели для глобального скри #: include/classes/api/services/CCorrelation.php:481 #: include/classes/api/services/CHost.php:848 #: include/classes/api/services/CHost.php:913 -#: include/classes/api/services/CIconMap.php:185 -#: include/classes/api/services/CIconMap.php:256 #: include/classes/api/services/CMaintenance.php:535 #: include/classes/api/services/CMaintenance.php:956 #: include/classes/api/services/CMaintenance.php:967 #: include/classes/api/services/CModule.php:48 -#: include/classes/api/services/CScript.php:269 -#: include/classes/api/services/CScript.php:512 -#: include/classes/api/services/CScript.php:965 #: include/classes/api/services/CTask.php:49 #: include/classes/api/services/CTask.php:247 #: include/classes/api/services/CTemplate.php:477 @@ -20056,24 +19905,28 @@ msgstr "[Ошибочное значение для дня: \"%1$s\" ]" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "[Ошибочное значение для месяца: \"%1$s\" ]" -#: include/classes/validators/CApiInputValidator.php:2143 +#: include/classes/validators/CApiInputValidator.php:2156 msgid "a DNS name is expected" msgstr "ожидается DNS имя" -#: include/classes/validators/CApiInputValidator.php:996 +#: include/classes/validators/CApiInputValidator.php:1004 msgid "a boolean is expected" msgstr "ожидается логическое" -#: include/classes/api/services/CUser.php:908 +#: include/classes/validators/CNewValidator.php:300 +msgid "a boolean value is expected" +msgstr "" + +#: include/classes/api/services/CUser.php:902 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 #: include/classes/validators/CActionCondValidator.php:186 -#: include/classes/validators/CApiInputValidator.php:318 +#: include/classes/validators/CApiInputValidator.php:326 #: include/classes/validators/CEventCorrCondValidator.php:91 -#: include/classes/validators/CNewValidator.php:326 +#: include/classes/validators/CNewValidator.php:290 msgid "a character string is expected" msgstr "ожидается строка символов" -#: include/classes/validators/CApiInputValidator.php:2357 +#: include/classes/validators/CApiInputValidator.php:2370 msgid "a date in YYYY-MM-DD format is expected" msgstr "ожидается дата в ГГГГ-ММ-ДД формате" @@ -20082,37 +19935,37 @@ msgid "a digit" msgstr "" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:747 +#: include/classes/validators/CApiInputValidator.php:755 msgid "a floating point value is expected" msgstr "ожидается значение с плавающей точкой" -#: include/classes/validators/CApiInputValidator.php:410 -#: include/classes/validators/CNewValidator.php:313 +#: include/classes/validators/CApiInputValidator.php:418 +#: include/classes/validators/CNewValidator.php:279 msgid "a hexadecimal color code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1601 +#: include/classes/validators/CApiInputValidator.php:1614 msgid "a low-level discovery macro is expected" msgstr "ожидается макрос низкоуровневого обнаружения" -#: include/classes/validators/CApiInputValidator.php:1480 +#: include/classes/validators/CApiInputValidator.php:1493 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "у числа слишком много десятичных точек" -#: include/classes/validators/CApiInputValidator.php:950 -#: include/classes/validators/CApiInputValidator.php:1459 -#: include/classes/validators/CApiInputValidator.php:2166 +#: include/classes/validators/CApiInputValidator.php:958 +#: include/classes/validators/CApiInputValidator.php:1472 +#: include/classes/validators/CApiInputValidator.php:2179 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "ожидается число" -#: include/classes/validators/CApiInputValidator.php:607 -#: include/classes/validators/CApiInputValidator.php:646 -#: include/classes/validators/CApiInputValidator.php:960 -#: include/classes/validators/CApiInputValidator.php:1468 -#: include/classes/validators/CApiInputValidator.php:1475 -#: include/classes/validators/CApiInputValidator.php:1768 +#: include/classes/validators/CApiInputValidator.php:615 +#: include/classes/validators/CApiInputValidator.php:654 +#: include/classes/validators/CApiInputValidator.php:968 +#: include/classes/validators/CApiInputValidator.php:1481 +#: include/classes/validators/CApiInputValidator.php:1488 +#: include/classes/validators/CApiInputValidator.php:1781 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "число слишком большое" @@ -20133,28 +19986,29 @@ msgstr "ожидается относительное время" msgid "a special character" msgstr "" -#: include/classes/validators/CApiInputValidator.php:2327 +#: include/classes/validators/CApiInputValidator.php:2340 msgid "a string, number or null value is expected" msgstr "ожидается строка, число или отсутствие значения" -#: include/classes/validators/CNewValidator.php:273 +#: include/classes/validators/CNewValidator.php:238 msgid "a time is expected" msgstr "ожидается время" -#: include/classes/validators/CApiInputValidator.php:1668 -#: include/classes/validators/CNewValidator.php:285 +#: include/classes/validators/CApiInputValidator.php:1681 +#: include/classes/validators/CNewValidator.php:252 +#: include/classes/validators/CNewValidator.php:265 msgid "a time period is expected" msgstr "ожидается период времени" -#: include/classes/validators/CApiInputValidator.php:1634 +#: include/classes/validators/CApiInputValidator.php:1647 #: include/validate.inc.php:221 msgid "a time range is expected" msgstr "ожидался период времени" #: app/controllers/CControllerPopupHttpStep.php:94 #: app/controllers/CControllerPopupLldOperation.php:154 -#: include/classes/validators/CApiInputValidator.php:1757 -#: include/classes/validators/CNewValidator.php:552 +#: include/classes/validators/CApiInputValidator.php:1770 +#: include/classes/validators/CNewValidator.php:496 #: include/validate.inc.php:213 include/validate.inc.php:594 msgid "a time unit is expected" msgstr "ожидается единица времени" @@ -20202,7 +20056,7 @@ msgstr "все" msgid "all media" msgstr "все способы оповещения" -#: include/classes/validators/CApiInputValidator.php:2063 +#: include/classes/validators/CApiInputValidator.php:2076 msgid "an IP address is expected" msgstr "ожидается IP адрес" @@ -20229,23 +20083,23 @@ msgstr "ожидается IP адрес" #: include/classes/import/validators/C60XmlValidator.php:2562 #: include/classes/import/validators/C60XmlValidator.php:2601 #: include/classes/import/validators/CXmlValidatorGeneral.php:283 -#: include/classes/validators/CApiInputValidator.php:555 -#: include/classes/validators/CApiInputValidator.php:687 -#: include/classes/validators/CApiInputValidator.php:785 -#: include/classes/validators/CApiInputValidator.php:904 -#: include/classes/validators/CApiInputValidator.php:1052 -#: include/classes/validators/CApiInputValidator.php:1250 -#: include/classes/validators/CApiInputValidator.php:1294 -#: include/classes/validators/CApiInputValidator.php:2474 +#: include/classes/validators/CApiInputValidator.php:563 +#: include/classes/validators/CApiInputValidator.php:695 +#: include/classes/validators/CApiInputValidator.php:793 +#: include/classes/validators/CApiInputValidator.php:912 +#: include/classes/validators/CApiInputValidator.php:1060 +#: include/classes/validators/CApiInputValidator.php:1263 +#: include/classes/validators/CApiInputValidator.php:1307 +#: include/classes/validators/CApiInputValidator.php:2487 msgid "an array is expected" msgstr "ожидается массив" -#: include/classes/validators/CApiInputValidator.php:1135 -#: include/classes/validators/CApiInputValidator.php:1205 +#: include/classes/validators/CApiInputValidator.php:1148 +#: include/classes/validators/CApiInputValidator.php:1218 msgid "an array or a character string is expected" msgstr "ожидается массив или строка символов" -#: include/classes/validators/CApiInputValidator.php:2307 +#: include/classes/validators/CApiInputValidator.php:2320 msgid "an array or object is expected" msgstr "ожидается массив или объект" @@ -20255,7 +20109,7 @@ msgid "an empty string is expected" msgstr "ожидается пустая строка" #: include/classes/api/services/CHost.php:1798 -#: include/classes/validators/CApiInputValidator.php:1168 +#: include/classes/validators/CApiInputValidator.php:1181 msgid "an even number of hexadecimal characters is expected" msgstr "ожидается четное количество шестнадцатеричных символов" @@ -20263,11 +20117,11 @@ msgstr "ожидается четное количество шестнадца msgid "an explicit time is expected" msgstr "ожидается время указанное явно" -#: include/classes/validators/CApiInputValidator.php:602 +#: include/classes/validators/CApiInputValidator.php:610 msgid "an integer is expected" msgstr "ожидается целое число" -#: include/classes/validators/CApiInputValidator.php:641 +#: include/classes/validators/CApiInputValidator.php:649 msgid "an unsigned integer is expected" msgstr "ожидается целое положительное число" @@ -20435,7 +20289,7 @@ msgstr "нельзя изменить" #: include/classes/api/services/CCorrelation.php:1125 #: include/classes/api/services/CCorrelation.php:1144 #: include/classes/api/services/CCorrelation.php:1158 -#: include/classes/api/services/CDiscoveryRule.php:1993 +#: include/classes/api/services/CDiscoveryRule.php:1989 #: include/classes/api/services/CDRule.php:210 #: include/classes/api/services/CDRule.php:216 #: include/classes/api/services/CDRule.php:326 @@ -20465,21 +20319,13 @@ msgstr "нельзя изменить" #: include/classes/api/services/CMapElement.php:106 #: include/classes/api/services/CMapElement.php:125 #: include/classes/api/services/CMapElement.php:163 -#: include/classes/api/services/CMediatype.php:378 -#: include/classes/api/services/CMediatype.php:397 -#: include/classes/api/services/CMediatype.php:413 -#: include/classes/api/services/CMediatype.php:489 -#: include/classes/api/services/CMediatype.php:705 -#: include/classes/api/services/CMediatype.php:731 -#: include/classes/api/services/CMediatype.php:748 -#: include/classes/api/services/CMediatype.php:800 #: include/classes/api/services/CProxy.php:707 #: include/classes/api/services/CProxy.php:781 #: include/classes/api/services/CTriggerGeneral.php:794 #: include/classes/api/services/CTriggerGeneral.php:827 #: include/classes/api/services/CUserGroup.php:473 -#: include/classes/api/services/CUser.php:759 -#: include/classes/api/services/CUser.php:919 +#: include/classes/api/services/CUser.php:753 +#: include/classes/api/services/CUser.php:913 #: include/classes/import/CConfigurationImport.php:744 #: include/classes/import/CConfigurationImport.php:977 #: include/classes/import/CConfigurationImport.php:1131 @@ -20497,14 +20343,14 @@ msgstr "нельзя изменить" #: include/classes/validators/CActionCondValidator.php:176 #: include/classes/validators/CActionCondValidator.php:182 #: include/classes/validators/CActionCondValidator.php:192 -#: include/classes/validators/CApiInputValidator.php:328 -#: include/classes/validators/CApiInputValidator.php:560 -#: include/classes/validators/CApiInputValidator.php:692 -#: include/classes/validators/CApiInputValidator.php:790 -#: include/classes/validators/CApiInputValidator.php:909 -#: include/classes/validators/CApiInputValidator.php:955 -#: include/classes/validators/CApiInputValidator.php:1255 -#: include/classes/validators/CApiInputValidator.php:1299 +#: include/classes/validators/CApiInputValidator.php:336 +#: include/classes/validators/CApiInputValidator.php:568 +#: include/classes/validators/CApiInputValidator.php:700 +#: include/classes/validators/CApiInputValidator.php:798 +#: include/classes/validators/CApiInputValidator.php:917 +#: include/classes/validators/CApiInputValidator.php:963 +#: include/classes/validators/CApiInputValidator.php:1268 +#: include/classes/validators/CApiInputValidator.php:1312 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20512,7 +20358,7 @@ msgstr "нельзя изменить" #: include/classes/validators/CEventCorrCondValidator.php:80 #: include/classes/validators/CEventCorrCondValidator.php:87 #: include/classes/validators/CEventCorrCondValidator.php:96 -#: include/classes/validators/CNewValidator.php:97 +#: include/classes/validators/CNewValidator.php:103 #: include/validate.inc.php:330 msgid "cannot be empty" msgstr "не может быть пустым" @@ -20525,7 +20371,7 @@ msgstr "не удалось сконвертировать в JSON, значен msgid "cannot perform Scroll API request, data could be truncated" msgstr "не удалось выполнить Scroll API запрос, данные могут быть обрезаны" -#: include/classes/api/services/CDiscoveryRule.php:1976 +#: include/classes/api/services/CDiscoveryRule.php:1972 msgid "cannot update property for templated discovery rule" msgstr "не удалось обновить свойство у правила обнаружения из шаблона" @@ -20559,7 +20405,7 @@ msgstr "закольцованная зависимость не разреше msgid "circular item dependency is not allowed" msgstr "закольцованная зависимость элементов данных не разрешена" -#: jsLoader.php:292 +#: jsLoader.php:273 msgid "color" msgstr "" @@ -20606,7 +20452,7 @@ msgstr "count() - Количество успешно полученных зн msgid "countunique() - The number of unique values" msgstr "countunique() - Количество уникальных значений" -#: include/func.inc.php:579 jsLoader.php:211 +#: include/func.inc.php:579 jsLoader.php:192 msgctxt "day short" msgid "d" msgstr "д" @@ -20668,7 +20514,7 @@ msgstr "по убыванию" msgid "description" msgstr "описание" -#: include/classes/validators/CApiInputValidator.php:1539 +#: include/classes/validators/CApiInputValidator.php:1552 msgid "directory cannot be empty" msgstr "папка не может быть пустой" @@ -20759,6 +20605,10 @@ msgstr "пустое выражение" msgid "failed to parse JSON" msgstr "ошибка при разборе JSON" +#: include/classes/validators/CApiInputValidator.php:2590 +msgid "file format is unsupported" +msgstr "" + #: app/controllers/CControllerPopupTriggerExpr.php:579 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)" msgstr "find() - Проверка наличия шаблона V (который удволетворяет оператору O) за период T (1 - соответствует, 0 - не соответствует)" @@ -20805,7 +20655,7 @@ msgstr "глобальные настройки очистки истории" msgid "graph pattern" msgstr "шаблон графиков" -#: include/func.inc.php:580 jsLoader.php:212 +#: include/func.inc.php:580 jsLoader.php:193 msgctxt "hour short" msgid "h" msgstr "ч" @@ -20846,6 +20696,11 @@ msgstr "иконка" msgid "image" msgstr "изображение" +#: include/classes/validators/CApiInputValidator.php:2584 +#, c-format +msgid "image size must be less than %1$s" +msgstr "" + #: include/actions.inc.php:28 msgid "in" msgstr "в" @@ -20922,7 +20777,7 @@ msgstr "ошибочный шаблон Prometheus" msgid "invalid address range \"%1$s\"" msgstr "ошибочный диапазон адресов \"%1$s\"" -#: include/classes/validators/CApiInputValidator.php:323 +#: include/classes/validators/CApiInputValidator.php:331 msgid "invalid byte sequence in UTF-8" msgstr "ошибочная последовательность байт в UTF-8" @@ -20951,11 +20806,11 @@ msgstr "недопустимый четвертый параметр в функ msgid "invalid history storage period" msgstr "недопустимый период хранения истории" -#: include/classes/validators/CApiInputValidator.php:1359 +#: include/classes/validators/CApiInputValidator.php:1372 msgid "invalid host group name" msgstr "ошибочное имя группы узлов сети" -#: include/classes/validators/CApiInputValidator.php:1403 +#: include/classes/validators/CApiInputValidator.php:1416 msgid "invalid host name" msgstr "ошибочное имя узла сети" @@ -20966,12 +20821,12 @@ msgid "invalid number of parameters in function \"%1$s\"" msgstr "недопустимое количество параметров в функции \"%1$s\"" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2405 +#: include/classes/validators/CApiInputValidator.php:2418 msgid "invalid range expression" msgstr "недопустимое выражение диапазона" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1704 +#: include/classes/validators/CApiInputValidator.php:1717 msgid "invalid regular expression" msgstr "ошибочное регулярное выражение" @@ -20999,7 +20854,7 @@ msgstr "больше чем или равно" msgid "is less than or equals" msgstr "меньше чем или равно" -#: include/classes/validators/CApiInputValidator.php:1982 +#: include/classes/validators/CApiInputValidator.php:1995 msgid "is not enclosed in {} or is malformed" msgstr "не заключено в {} или ошибочно" @@ -21085,12 +20940,12 @@ msgstr "правило низкоуровневого обнаружения" msgid "ltrim() - Remove specified characters from the beginning of a string" msgstr "ltrim() - Удаление указанных символов с начала строки" -#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377 +#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358 msgctxt "minute short" msgid "m" msgstr "м" -#: include/func.inc.php:578 jsLoader.php:210 +#: include/func.inc.php:578 jsLoader.php:191 msgctxt "month short" msgid "m" msgstr "м" @@ -21189,7 +21044,7 @@ msgid "min() - Minimum value for period T" msgstr "min() - Минимальное значение за период Т" #: include/classes/api/services/CHost.php:1804 -#: include/classes/validators/CApiInputValidator.php:1162 +#: include/classes/validators/CApiInputValidator.php:1175 #, c-format msgid "minimum length is %1$s characters" msgstr "минимальная длина %1$s символов" @@ -21216,8 +21071,8 @@ msgctxt "millisecond short" msgid "ms" msgstr "мс" -#: include/classes/validators/CApiInputValidator.php:2430 -#: include/classes/validators/CApiInputValidator.php:2508 +#: include/classes/validators/CApiInputValidator.php:2443 +#: include/classes/validators/CApiInputValidator.php:2521 #, c-format msgid "must be %1$s characters long" msgstr "должно быть %1$s символа" @@ -21232,27 +21087,14 @@ msgstr "должен быть действительным пользовате msgid "must be at least %1$d characters long" msgstr "" -#: include/classes/api/services/CMediatype.php:388 -#: include/classes/api/services/CMediatype.php:404 -#: include/classes/api/services/CMediatype.php:422 -#: include/classes/api/services/CMediatype.php:428 -#: include/classes/api/services/CMediatype.php:715 -#: include/classes/api/services/CMediatype.php:722 -#: include/classes/api/services/CMediatype.php:738 -#: include/classes/api/services/CMediatype.php:757 -#: include/classes/api/services/CMediatype.php:763 -#, c-format -msgid "must be between \"%1$s\" and \"%2$s\"" -msgstr "должно быть между \"%1$s\" и \"%2$s\"" - #: app/views/administration.authentication.edit.php:56 #: app/views/administration.user.edit.php:134 #: include/classes/validators/CPasswordComplexityValidator.php:88 msgid "must contain at least one digit" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1366 -#: include/classes/validators/CApiInputValidator.php:1410 +#: include/classes/validators/CApiInputValidator.php:1379 +#: include/classes/validators/CApiInputValidator.php:1423 msgid "must contain at least one low-level discovery macro" msgstr "должно содержать по крайней мере один макрос низкоуровневого обнаружения" @@ -21280,6 +21122,14 @@ msgstr "" msgid "must not contain user's name, surname or username" msgstr "" +#: include/translateDefines.inc.php:38 +msgid "n-d" +msgstr "" + +#: include/translateDefines.inc.php:36 +msgid "n-d H:i" +msgstr "" + #: include/views/configuration.host.discovery.edit.php:182 #: include/views/configuration.host.discovery.edit.php:320 #: include/views/configuration.item.edit.php:218 @@ -21290,7 +21140,7 @@ msgstr "" msgid "name" msgstr "название" -#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314 +#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295 msgid "new" msgstr "новый" @@ -21425,7 +21275,7 @@ msgstr "вывод" msgid "path/to/secret" msgstr "путь/к/секрету" -#: include/classes/html/CMacroValue.php:139 jsLoader.php:388 +#: include/classes/html/CMacroValue.php:139 jsLoader.php:369 msgid "path/to/secret:key" msgstr "путь/к/секрету:ключ" @@ -21460,24 +21310,24 @@ msgstr "radians() - Конвертация значения из градусо msgid "rand() - A random integer value" msgstr "rand() - Случайное целое число" -#: include/classes/api/services/CService.php:1822 +#: include/classes/api/services/CService.php:2343 #, c-format msgid "read-write access to the child service \"%1$s\" is required" msgstr "" -#: include/classes/api/services/CService.php:476 +#: include/classes/api/services/CService.php:497 #, c-format msgid "read-write access to the child service \"%1$s\" must be retained" msgstr "" -#: include/classes/api/services/CService.php:463 -#: include/classes/api/services/CService.php:1739 -#: include/classes/api/services/CService.php:1799 +#: include/classes/api/services/CService.php:484 +#: include/classes/api/services/CService.php:2260 +#: include/classes/api/services/CService.php:2320 msgid "read-write access to the service is required" msgstr "" -#: include/classes/api/services/CService.php:1798 -#: include/classes/api/services/CService.php:1860 +#: include/classes/api/services/CService.php:2319 +#: include/classes/api/services/CService.php:2381 msgid "read-write access to the service must be retained" msgstr "" @@ -21596,7 +21446,6 @@ msgstr "краткое описание" #: include/classes/api/services/CItemGeneral.php:2528 #: include/classes/api/services/CMaintenance.php:502 #: include/classes/api/services/CMaintenance.php:724 -#: include/classes/api/services/CMediatype.php:793 #: include/classes/api/services/CProxy.php:658 #: include/classes/api/services/CProxy.php:683 #: include/classes/api/services/CProxy.php:790 @@ -21605,6 +21454,7 @@ msgstr "краткое описание" #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:583 #: include/classes/validators/CActionCondValidator.php:146 +#: include/classes/validators/CApiInputValidator.php:1068 msgid "should be empty" msgstr "должно быть пустым" @@ -21660,7 +21510,7 @@ msgstr "sum() - Сумма значений за период Т" msgid "sumofsquares() - The sum of squares" msgstr "sumofsquares() - Сумма квадратов" -#: include/classes/api/services/CUser.php:2047 +#: include/classes/api/services/CUser.php:2041 msgid "supplied credentials are not unique" msgstr "заданная учётная запись не уникальна" @@ -21672,7 +21522,7 @@ msgstr "заданная учётная запись не уникальна" #: app/views/administration.usergroup.edit.php:182 #: app/views/administration.userrole.edit.php:170 #: app/views/administration.userrole.edit.php:211 -#: app/views/popup.service.edit.php:84 +#: app/views/popup.service.edit.php:89 #: include/classes/api/services/CUserGroup.php:473 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 @@ -21693,13 +21543,17 @@ msgstr "tan() - Тангенс значения" msgid "template ID \"%1$s\" is passed %2$s times" msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз" -#: app/controllers/CControllerDashboardUpdate.php:188 -#: app/controllers/CControllerDashboardUpdate.php:197 -#: app/controllers/CControllerDashboardUpdate.php:209 +#: include/classes/validators/CApiInputValidator.php:2623 +msgid "the last new line feed is missing" +msgstr "" + +#: app/controllers/CControllerDashboardUpdate.php:192 +#: app/controllers/CControllerDashboardUpdate.php:201 +#: app/controllers/CControllerDashboardUpdate.php:213 #: include/classes/api/services/CAutoregistration.php:147 -#: include/classes/api/services/CDiscoveryRule.php:1650 -#: include/classes/api/services/CDiscoveryRule.php:2011 -#: include/classes/api/services/CDiscoveryRule.php:2019 +#: include/classes/api/services/CDiscoveryRule.php:1646 +#: include/classes/api/services/CDiscoveryRule.php:2007 +#: include/classes/api/services/CDiscoveryRule.php:2015 #: include/classes/api/services/CHostBase.php:523 #: include/classes/api/services/CHost.php:1907 #: include/classes/api/services/CHost.php:2140 @@ -21714,14 +21568,14 @@ msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз" #: include/classes/api/services/CReport.php:195 #: include/classes/api/services/CReport.php:577 #: include/classes/api/services/CReport.php:583 -#: include/classes/api/services/CScript.php:1025 +#: include/classes/api/services/CScript.php:884 #: include/classes/api/services/CTemplate.php:451 #: include/classes/api/services/CValueMap.php:578 #: include/classes/helpers/CDashboardHelper.php:369 #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:1091 +#: include/classes/validators/CApiInputValidator.php:1104 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "параметр \"%1$s\" отсутствует" @@ -21757,7 +21611,7 @@ msgstr "ожидается третий параметр" msgid "time filter default period exceeds the max period" msgstr "период времени фильтра по умолчанию превышает максимальный период" -#: jsLoader.php:293 +#: jsLoader.php:274 msgid "time shift" msgstr "сдвиг времени" @@ -21820,11 +21674,11 @@ msgid "truncate() - Truncates a value to decimal places" msgstr "truncate() - Усечение значения до десятичных знаков" #: app/partials/layout.htmlpage.aside.php:74 -#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313 +#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294 msgid "type here to search" msgstr "начните печатать для поиска" -#: include/classes/validators/CApiInputValidator.php:2019 +#: include/classes/validators/CApiInputValidator.php:2032 msgid "unacceptable URL" msgstr "неприемлемый URL" @@ -21859,10 +21713,10 @@ msgstr "неожиданный конец ключа" msgid "unexpected end of macro" msgstr "неожиданное завершение макроса" -#: include/classes/api/services/CDiscoveryRule.php:1670 -#: include/classes/api/services/CDiscoveryRule.php:1702 -#: include/classes/api/services/CDiscoveryRule.php:1725 -#: include/classes/api/services/CDiscoveryRule.php:1744 +#: include/classes/api/services/CDiscoveryRule.php:1666 +#: include/classes/api/services/CDiscoveryRule.php:1698 +#: include/classes/api/services/CDiscoveryRule.php:1721 +#: include/classes/api/services/CDiscoveryRule.php:1740 #: include/classes/api/services/CGraphGeneral.php:627 #: include/classes/api/services/CGraphGeneral.php:749 #: include/classes/api/services/CHostPrototype.php:325 @@ -21872,11 +21726,11 @@ msgstr "неожиданное завершение макроса" #: include/classes/api/services/CHttpTest.php:539 #: include/classes/api/services/CItemGeneral.php:604 #: include/classes/api/services/CItemGeneral.php:616 -#: include/classes/api/services/CScript.php:1031 +#: include/classes/api/services/CScript.php:890 #: include/classes/api/services/CTemplate.php:668 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:1061 +#: include/classes/validators/CApiInputValidator.php:1074 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "неожиданный параметр \"%1$s\"" @@ -21943,7 +21797,7 @@ msgstr "неподдерживаемый номер версии" #: app/views/js/popup.valuemap.edit.js.php:31 #: app/views/js/popup.valuemap.edit.js.php:32 #: app/views/popup.itemtestedit.view.php:83 -#: app/views/popup.service.edit.php:95 +#: app/views/popup.service.edit.php:102 #: include/classes/helpers/CTagFilterFieldHelper.php:78 #: include/classes/helpers/CTagFilterFieldHelper.php:131 #: include/classes/html/CMacroValue.php:131 @@ -21963,11 +21817,11 @@ msgstr "неподдерживаемый номер версии" #: include/views/js/configuration.httpconf.edit.js.php:73 #: include/views/js/configuration.maintenance.edit.js.php:37 #: include/views/js/configuration.maintenance.edit.js.php:61 -#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389 +#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370 msgid "value" msgstr "значение" -#: include/classes/api/services/CDiscoveryRule.php:1890 +#: include/classes/api/services/CDiscoveryRule.php:1886 #, c-format msgid "value \"%1$s\" already exists" msgstr "значение \"%1$s\" уже существует" @@ -21985,38 +21839,39 @@ msgstr "значение \"%1$s\" не найдено" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:575 #: include/classes/api/services/CValueMap.php:587 -#: include/classes/validators/CApiInputValidator.php:1802 -#: include/classes/validators/CApiInputValidator.php:1892 +#: include/classes/validators/CApiInputValidator.php:1815 +#: include/classes/validators/CApiInputValidator.php:1905 #, c-format msgid "value %1$s already exists" msgstr "значение %1$s уже существует" #: include/classes/api/services/CTriggerGeneral.php:1773 #: include/classes/api/services/CTriggerGeneral.php:1793 -#: include/classes/validators/CApiInputValidator.php:355 -#: include/classes/validators/CApiInputValidator.php:523 -#: include/classes/validators/CApiInputValidator.php:1174 -#: include/classes/validators/CApiInputValidator.php:1304 -#: include/classes/validators/CApiInputValidator.php:1350 -#: include/classes/validators/CApiInputValidator.php:1393 -#: include/classes/validators/CApiInputValidator.php:1447 -#: include/classes/validators/CApiInputValidator.php:1522 -#: include/classes/validators/CApiInputValidator.php:1565 -#: include/classes/validators/CApiInputValidator.php:1596 -#: include/classes/validators/CApiInputValidator.php:1627 -#: include/classes/validators/CApiInputValidator.php:1661 -#: include/classes/validators/CApiInputValidator.php:1695 -#: include/classes/validators/CApiInputValidator.php:1741 -#: include/classes/validators/CApiInputValidator.php:1977 -#: include/classes/validators/CApiInputValidator.php:2009 -#: include/classes/validators/CApiInputValidator.php:2051 -#: include/classes/validators/CApiInputValidator.php:2093 -#: include/classes/validators/CApiInputValidator.php:2132 -#: include/classes/validators/CApiInputValidator.php:2181 -#: include/classes/validators/CApiInputValidator.php:2234 -#: include/classes/validators/CApiInputValidator.php:2278 -#: include/classes/validators/CApiInputValidator.php:2398 -#: include/classes/validators/CApiInputValidator.php:2538 +#: include/classes/validators/CApiInputValidator.php:363 +#: include/classes/validators/CApiInputValidator.php:531 +#: include/classes/validators/CApiInputValidator.php:1187 +#: include/classes/validators/CApiInputValidator.php:1317 +#: include/classes/validators/CApiInputValidator.php:1363 +#: include/classes/validators/CApiInputValidator.php:1406 +#: include/classes/validators/CApiInputValidator.php:1460 +#: include/classes/validators/CApiInputValidator.php:1535 +#: include/classes/validators/CApiInputValidator.php:1578 +#: include/classes/validators/CApiInputValidator.php:1609 +#: include/classes/validators/CApiInputValidator.php:1640 +#: include/classes/validators/CApiInputValidator.php:1674 +#: include/classes/validators/CApiInputValidator.php:1708 +#: include/classes/validators/CApiInputValidator.php:1754 +#: include/classes/validators/CApiInputValidator.php:1990 +#: include/classes/validators/CApiInputValidator.php:2022 +#: include/classes/validators/CApiInputValidator.php:2064 +#: include/classes/validators/CApiInputValidator.php:2106 +#: include/classes/validators/CApiInputValidator.php:2145 +#: include/classes/validators/CApiInputValidator.php:2194 +#: include/classes/validators/CApiInputValidator.php:2247 +#: include/classes/validators/CApiInputValidator.php:2291 +#: include/classes/validators/CApiInputValidator.php:2411 +#: include/classes/validators/CApiInputValidator.php:2551 +#: include/classes/validators/CApiInputValidator.php:2618 msgid "value is too long" msgstr "значение слишком длинное" @@ -22026,35 +21881,35 @@ msgstr "значение слишком длинное" msgid "value must be %1$s" msgstr "значение должно быть %1$s" -#: include/classes/validators/CApiInputValidator.php:2363 +#: include/classes/validators/CApiInputValidator.php:2376 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "значение должно быть между \"%1$s\" и \"%2$s\"" -#: include/classes/validators/CApiInputValidator.php:514 +#: include/classes/validators/CApiInputValidator.php:522 msgid "value must be empty" msgstr "" -#: include/classes/validators/CApiInputValidator.php:511 +#: include/classes/validators/CApiInputValidator.php:519 #, c-format msgid "value must be empty or one of %1$s" msgstr "" -#: include/classes/validators/CNewValidator.php:230 +#: include/classes/validators/CNewValidator.php:208 #, c-format msgid "value must be no greater than \"%1$s\"" msgstr "значение должно быть не больше чем \"%1$s\"" -#: include/classes/validators/CNewValidator.php:214 +#: include/classes/validators/CNewValidator.php:196 #, c-format msgid "value must be no less than \"%1$s\"" msgstr "значение должно быть не меньше чем \"%1$s\"" #: app/controllers/CControllerPopupHttpStep.php:101 -#: include/classes/api/services/CDiscoveryRule.php:1683 -#: include/classes/api/services/CDiscoveryRule.php:1714 -#: include/classes/api/services/CDiscoveryRule.php:1734 -#: include/classes/api/services/CDiscoveryRule.php:1756 +#: include/classes/api/services/CDiscoveryRule.php:1679 +#: include/classes/api/services/CDiscoveryRule.php:1710 +#: include/classes/api/services/CDiscoveryRule.php:1730 +#: include/classes/api/services/CDiscoveryRule.php:1752 #: include/classes/api/services/CEvent.php:780 #: include/classes/api/services/CHost.php:923 #: include/classes/api/services/CHost.php:1969 @@ -22069,15 +21924,15 @@ msgstr "значение должно быть не меньше чем \"%1$s\" #: include/classes/import/validators/C52XmlValidator.php:2582 #: include/classes/import/validators/C54XmlValidator.php:2595 #: include/classes/import/validators/C60XmlValidator.php:2596 -#: include/classes/validators/CApiInputValidator.php:508 -#: include/classes/validators/CApiInputValidator.php:847 -#: include/classes/validators/CNewValidator.php:545 +#: include/classes/validators/CApiInputValidator.php:516 +#: include/classes/validators/CApiInputValidator.php:855 +#: include/classes/validators/CNewValidator.php:489 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "значение должно быть одно из %1$s" -#: include/classes/validators/CApiInputValidator.php:872 +#: include/classes/validators/CApiInputValidator.php:880 #, c-format msgid "value must be within the range of %1$s" msgstr "" @@ -22120,7 +21975,7 @@ msgstr "ошибочный тип правила обнаружения" msgid "wrong item type" msgstr "ошибочный тип элемента данных" -#: include/func.inc.php:577 jsLoader.php:209 +#: include/func.inc.php:577 jsLoader.php:190 msgctxt "year short" msgid "y" msgstr "г" |