diff options
| author | Continuous Integration <ci@zabbix.com> | 2021-07-23 20:00:46 +0300 |
|---|---|---|
| committer | Continuous Integration <ci@zabbix.com> | 2021-07-23 20:00:46 +0300 |
| commit | bd351b5c654ef40bfa6f124c29eb123c2bb66145 (patch) | |
| tree | 02eb72ee9cdf45d99925decbee1cf51d9aacd15b /ui/locale/ru/LC_MESSAGES/frontend.po | |
| parent | 6e4ae53b1ab4525eb50c8c729fd39b209e2abf77 (diff) | |
.......... [ZBX-1357] automatic translation file sync for trunk
Diffstat (limited to 'ui/locale/ru/LC_MESSAGES/frontend.po')
| -rw-r--r-- | ui/locale/ru/LC_MESSAGES/frontend.po | 3644 |
1 files changed, 1838 insertions, 1806 deletions
diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po index f0b13f76b72..46720e538da 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-07-16 10:58+0300\n" +"POT-Creation-Date: 2021-07-23 19:55+0300\n" "PO-Revision-Date: 2021-06-17 14:02+0300\n" "Last-Translator: Alexey <dotneft@gmail.com>\n" "Language-Team: Zabbix translation team\n" @@ -38,6 +38,7 @@ msgstr "\"%1$s\" вместо \"%2$s\"" #: include/classes/import/validators/C50XmlValidator.php:1864 #: include/classes/import/validators/C52XmlValidator.php:1986 #: include/classes/import/validators/C54XmlValidator.php:2041 +#: include/classes/import/validators/C60XmlValidator.php:2042 #, c-format msgid "\"%1$s\" is expected" msgstr "\"%1$s\" ожидалось" @@ -54,7 +55,7 @@ msgstr "\"%1$s\" должно быть пустой строкой или бол #: include/classes/api/services/CMaintenance.php:599 #: include/classes/api/services/CMaintenance.php:615 #: include/classes/api/services/CMaintenance.php:684 maintenance.php:137 -#: maintenance.php:143 services.php:177 services.php:186 +#: maintenance.php:143 #, c-format msgid "\"%1$s\" must be between 1970.01.01 and 2038.01.18." msgstr "\"%1$s\" должно быть между 1970.01.01 и 2038.01.18." @@ -90,7 +91,7 @@ msgstr[0] "%1$d день" msgstr[1] "%1$d дня" msgstr[2] "%1$d дней" -#: jsLoader.php:325 +#: jsLoader.php:323 #, c-format msgctxt "screen reader" msgid "%1$d matches for %2$s found" @@ -109,7 +110,7 @@ msgstr[2] "отображено %1$d из %3$d%2$s проблем" msgid "%1$d problems selected." msgstr "%1$d выбрано проблем." -#: chart4.php:94 chart5.php:89 +#: chart4.php:94 #, c-format msgid "%1$s (year %2$s)" msgstr "%1$s (год %2$s)" @@ -125,7 +126,7 @@ msgstr "%1$s - вызвано модулем, который расположе msgid "%1$s [Line: %2$s | Column: %3$s]" msgstr "%1$s [Строка: %2$s | Колонка: %3$s]" -#: include/actions.inc.php:1814 +#: include/actions.inc.php:1869 #, c-format msgctxt "screen reader" msgid "%1$s action" @@ -169,7 +170,7 @@ msgstr[0] "%1$s элемент данных" msgstr[1] "%1$s элемента данных" msgstr[2] "%1$s элементов данных" -#: include/actions.inc.php:1653 +#: include/actions.inc.php:1708 #, c-format msgctxt "screen reader" msgid "%1$s message" @@ -182,7 +183,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:2572 -#: jsLoader.php:170 jsLoader.php:171 jsLoader.php:172 jsLoader.php:173 +#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171 #, c-format msgid "%1$s minute" msgid_plural "%1$s minutes" @@ -198,7 +199,7 @@ msgstr[0] "%1$s из %2$s элемента в состоянии проблем msgstr[1] "%1$s из %2$s элементов в состоянии проблемы" msgstr[2] "%1$s из %2$s элементов в состоянии проблемы" -#: jsLoader.php:326 +#: jsLoader.php:324 #, c-format msgctxt "screen reader" msgid "%1$s preselected, use down,up arrow keys and enter to select" @@ -222,8 +223,8 @@ msgstr[1] "всего %1$s проблемы" msgstr[2] "всего %1$s проблем" #: app/views/monitoring.widget.actionlog.view.php:45 -#: include/actions.inc.php:2090 -#: include/views/administration.auditacts.list.php:83 +#: include/actions.inc.php:2145 +#: include/views/administration.auditacts.list.php:84 #, c-format msgid "%1$s retry left" msgid_plural "%1$s retries left" @@ -234,7 +235,7 @@ msgstr[2] "%1$s попыток осталось" #: app/views/administration.user.edit.php:522 #: include/classes/widgets/CWidgetConfig.php:283 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2579 -#: jsLoader.php:168 jsLoader.php:169 +#: jsLoader.php:166 jsLoader.php:167 #, c-format msgid "%1$s second" msgid_plural "%1$s seconds" @@ -242,7 +243,7 @@ msgstr[0] "%1$s секунда" msgstr[1] "%1$s секунды" msgstr[2] "%1$s секунд" -#: jsLoader.php:307 +#: jsLoader.php:305 #, c-format msgid "%1$s symbols remaining" msgstr "осталось %1$s символов" @@ -263,13 +264,13 @@ msgctxt "screen reader" msgid "%1$s, Severity, %2$s" msgstr "%1$s, Важность, %2$s" -#: jsLoader.php:320 +#: jsLoader.php:318 #, c-format msgctxt "screen reader" msgid "%1$s, read only" msgstr "%1$s, только чтение" -#: jsLoader.php:363 +#: jsLoader.php:361 #, c-format msgctxt "screen reader" msgid "%1$s, selected" @@ -309,7 +310,7 @@ msgstr "(0 - использовать умолчание действия)" msgid "(Only super admins can create groups)" msgstr "(Только супер администраторы могут создавать группы)" -#: app/views/popup.itemtestedit.view.php:240 +#: app/views/popup.itemtestedit.view.php:242 #: app/views/popup.massupdate.host.php:85 #: include/views/configuration.host.edit.php:196 #: include/views/configuration.host.prototype.edit.php:133 @@ -392,12 +393,12 @@ msgstr "ДОБАВЛЕНИЕ ЗАМЕЩЕНИЯ" msgid "AND" msgstr "И" -#: app/views/administration.user.list.php:114 +#: app/views/administration.user.list.php:115 msgid "API access" msgstr "Доступ к API" #: app/controllers/CControllerPopupGeneric.php:347 -#: app/views/administration.userrole.edit.php:201 +#: app/views/administration.userrole.edit.php:194 msgid "API methods" msgstr "API методы" @@ -455,8 +456,8 @@ msgstr "API токен обновлен" #: app/views/administration.user.token.edit.php:31 #: app/views/administration.user.token.list.php:67 #: app/views/administration.user.token.view.php:27 -#: include/classes/helpers/CMenuHelper.php:253 -#: include/classes/helpers/CMenuHelper.php:375 include/html.inc.php:817 +#: include/classes/helpers/CMenuHelper.php:255 +#: include/classes/helpers/CMenuHelper.php:377 include/html.inc.php:817 #: include/html.inc.php:887 msgid "API tokens" msgstr "API токены" @@ -465,12 +466,6 @@ msgstr "API токены" msgid "Abscissa" msgstr "Ось абсцисс" -#: app/views/report.services.php:80 app/views/report.services.php:81 -#: app/views/report.services.php:82 app/views/report.services.php:83 -#: srv_status.php:149 -msgid "Acceptable SLA" -msgstr "Допустимый уровень SLA" - #: include/func.inc.php:1511 msgid "Access denied" msgstr "Доступ запрещен" @@ -480,43 +475,43 @@ msgid "Access denied!" msgstr "Доступ запрещен!" #: app/views/administration.user.edit.php:456 -#: app/views/administration.userrole.edit.php:185 +#: app/views/administration.userrole.edit.php:179 msgid "Access to API" msgstr "Доступ к API" #: app/views/administration.user.edit.php:411 -#: app/views/administration.userrole.edit.php:82 +#: app/views/administration.userrole.edit.php:81 msgid "Access to UI elements" msgstr "Доступ к элементам веб-интерфейса" #: app/views/administration.user.edit.php:483 -#: app/views/administration.userrole.edit.php:239 +#: app/views/administration.userrole.edit.php:231 msgid "Access to actions" msgstr "Доступ к действиям" #: app/views/administration.user.edit.php:430 -#: app/views/administration.userrole.edit.php:134 +#: app/views/administration.userrole.edit.php:131 msgid "Access to modules" msgstr "Доступ к модулям" #: app/views/hint.box.php:77 app/views/monitoring.widget.problems.view.php:66 -#: include/actions.inc.php:153 include/blocks.inc.php:722 +#: include/actions.inc.php:161 include/blocks.inc.php:722 #: include/classes/screens/CScreenProblem.php:876 #: include/classes/screens/CScreenProblem.php:901 -#: include/classes/screens/CScreenProblem.php:1169 include/events.inc.php:287 +#: include/classes/screens/CScreenProblem.php:1170 include/events.inc.php:290 msgid "Ack" msgstr "Подтверждено" -#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:330 +#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328 msgid "Acknowledge" msgstr "Подтвердить" -#: include/classes/helpers/CRoleHelper.php:497 +#: include/classes/helpers/CRoleHelper.php:494 msgid "Acknowledge problems" msgstr "Подтверждение проблем" -#: app/views/popup.condition.common.php:652 include/actions.inc.php:1993 -#: include/events.inc.php:193 +#: app/views/popup.condition.common.php:687 include/actions.inc.php:2048 +#: include/events.inc.php:196 msgid "Acknowledged" msgstr "Подтверждено" @@ -539,7 +534,7 @@ msgstr "Подтвержденные РЕШЕННЫЕ события" #: app/views/administration.iconmap.edit.php:58 #: app/views/administration.mediatype.edit.php:104 #: app/views/administration.mediatype.edit.php:156 -#: app/views/administration.mediatype.list.php:82 +#: app/views/administration.mediatype.list.php:83 #: app/views/administration.regex.edit.php:52 #: app/views/administration.script.edit.php:66 #: app/views/administration.user.edit.php:254 @@ -550,20 +545,23 @@ msgstr "Подтвержденные РЕШЕННЫЕ события" #: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207 #: app/views/popup.massupdate.item.php:228 #: app/views/popup.massupdate.item.php:486 +#: app/views/popup.massupdate.service.php:50 #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:87 #: app/views/popup.massupdate.trigger.php:101 +#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:133 +#: app/views/popup.service.edit.php:183 app/views/popup.service.edit.php:200 #: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:125 -#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:70 -#: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1756 -#: include/actions.inc.php:1839 -#: include/views/administration.auditacts.list.php:63 +#: app/views/popup.valuemap.edit.php:51 app/views/reports.auditlog.list.php:71 +#: app/views/reports.auditlog.list.php:91 include/actions.inc.php:1811 +#: include/actions.inc.php:1894 +#: include/views/administration.auditacts.list.php:64 #: include/views/configuration.action.edit.php:59 -#: include/views/configuration.action.edit.php:174 -#: include/views/configuration.action.edit.php:178 -#: include/views/configuration.action.edit.php:321 -#: include/views/configuration.action.edit.php:407 -#: include/views/configuration.action.edit.php:478 +#: include/views/configuration.action.edit.php:175 +#: include/views/configuration.action.edit.php:179 +#: include/views/configuration.action.edit.php:322 +#: include/views/configuration.action.edit.php:410 +#: include/views/configuration.action.edit.php:481 #: include/views/configuration.graph.edit.php:380 #: include/views/configuration.host.discovery.edit.php:126 #: include/views/configuration.host.discovery.edit.php:584 @@ -577,8 +575,6 @@ msgstr "Подтвержденные РЕШЕННЫЕ события" #: include/views/configuration.item.prototype.edit.php:143 #: include/views/configuration.item.prototype.edit.php:654 #: include/views/configuration.maintenance.edit.php:45 -#: include/views/configuration.services.edit.php:126 -#: include/views/configuration.services.edit.php:180 #: include/views/configuration.template.edit.php:127 #: include/views/configuration.trigger.prototype.edit.php:199 #: include/views/configuration.trigger.prototype.edit.php:394 @@ -593,14 +589,14 @@ msgstr "Подтвержденные РЕШЕННЫЕ события" #: include/views/js/monitoring.sysmaps.js.php:792 #: include/views/monitoring.sysmap.edit.php:278 #: include/views/monitoring.sysmap.edit.php:322 -#: include/views/monitoring.sysmap.edit.php:359 services.php:348 +#: include/views/monitoring.sysmap.edit.php:359 msgid "Action" msgstr "Действие" -#: include/classes/api/services/CAction.php:2709 -#: include/classes/api/services/CAction.php:2727 -#: include/classes/api/services/CAction.php:2904 -#: include/classes/api/services/CAction.php:2937 +#: include/classes/api/services/CAction.php:2724 +#: include/classes/api/services/CAction.php:2744 +#: include/classes/api/services/CAction.php:2922 +#: include/classes/api/services/CAction.php:2955 #, c-format msgid "Action \"%1$s\" already exists." msgstr "Действие \"%1$s\" уже существует." @@ -610,33 +606,33 @@ msgstr "Действие \"%1$s\" уже существует." msgid "Action \"%1$s\" is not available." msgstr "Действие \"%1$s\" недоступно" -#: include/classes/api/services/CAction.php:2780 -#: include/classes/api/services/CAction.php:2981 +#: include/classes/api/services/CAction.php:2797 +#: include/classes/api/services/CAction.php:2999 #, c-format msgid "Action \"%1$s\" no operations defined." msgstr "В действии \"%1$s\" нет заданных операций." -#: actionconf.php:177 +#: actionconf.php:178 msgid "Action added" msgstr "Действие добавлено" -#: include/classes/core/ZBase.php:536 +#: include/classes/core/ZBase.php:534 #, c-format msgid "Action class %1$s must extend %2$s class." msgstr "Класс действия %1$s должен расширять %2$s класс." -#: actionconf.php:199 +#: actionconf.php:200 msgid "Action deleted" msgstr "Действие удалено" -#: actionconf.php:374 +#: actionconf.php:375 msgid "Action disabled" msgid_plural "Actions disabled" msgstr[0] "Действие деактивировано" msgstr[1] "Действий деактивировано" msgstr[2] "Действия деактивированы" -#: actionconf.php:373 +#: actionconf.php:374 msgid "Action enabled" msgid_plural "Actions enabled" msgstr[0] "Действие активировано" @@ -651,12 +647,12 @@ msgid "Action log" msgstr "Журнал действий" #: app/views/administration.script.edit.php:101 -#: app/views/administration.script.list.php:50 -#: app/views/administration.script.list.php:89 +#: app/views/administration.script.list.php:51 +#: app/views/administration.script.list.php:90 msgid "Action operation" msgstr "Операция действия" -#: actionconf.php:169 +#: actionconf.php:170 msgid "Action updated" msgstr "Действие обновлено" @@ -668,41 +664,41 @@ msgstr "Действие обновлено" #: include/classes/helpers/CRoleHelper.php:435 #: include/classes/screens/CScreenProblem.php:877 #: include/classes/screens/CScreenProblem.php:902 -#: include/classes/screens/CScreenProblem.php:1170 -#: include/classes/screens/CScreenProblem.php:1231 include/events.inc.php:288 +#: include/classes/screens/CScreenProblem.php:1171 +#: include/classes/screens/CScreenProblem.php:1232 include/events.inc.php:291 #: include/forms.inc.php:1217 include/views/configuration.action.edit.php:28 -#: include/views/monitoring.sysmap.list.php:68 jsLoader.php:146 -#: jsLoader.php:174 jsLoader.php:189 jsLoader.php:203 jsLoader.php:329 +#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144 +#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327 #: tr_events.php:182 msgid "Actions" msgstr "Действия" #: app/views/administration.proxy.edit.php:77 -#: app/views/administration.proxy.list.php:50 -#: app/views/administration.proxy.list.php:151 +#: app/views/administration.proxy.list.php:51 +#: app/views/administration.proxy.list.php:152 msgid "Active" msgstr "Активный" -#: include/views/configuration.maintenance.list.php:65 -#: include/views/configuration.maintenance.list.php:103 +#: include/views/configuration.maintenance.list.php:66 +#: include/views/configuration.maintenance.list.php:104 msgctxt "maintenance status" msgid "Active" msgstr "Активно" #: include/views/configuration.maintenance.edit.php:110 -#: include/views/configuration.maintenance.list.php:86 maintenance.php:44 +#: include/views/configuration.maintenance.list.php:87 maintenance.php:44 #: maintenance.php:137 msgid "Active since" msgstr "Активно с" #: include/views/configuration.maintenance.edit.php:117 -#: include/views/configuration.maintenance.list.php:87 maintenance.php:47 +#: include/views/configuration.maintenance.list.php:88 maintenance.php:47 #: maintenance.php:143 msgid "Active till" msgstr "Активно до" #: app/controllers/CControllerAuditLogList.php:168 -#: app/partials/common.filter.trigger.php:146 +#: app/partials/common.filter.trigger.php:147 #: app/partials/configuration.tags.tab.php:118 #: app/partials/configuration.valuemap.php:40 #: app/partials/hostmacros.inherited.list.html.php:180 @@ -716,7 +712,7 @@ msgstr "Активно до" #: app/partials/monitoring.problem.filter.php:202 #: app/partials/popup.operations.php:89 app/partials/popup.operations.php:109 #: app/partials/popup.operations.php:261 -#: app/partials/scheduledreport.formgrid.html.php:254 +#: app/partials/scheduledreport.formgrid.html.php:252 #: app/views/administration.iconmap.edit.php:104 #: app/views/administration.iconmap.edit.php:153 #: app/views/administration.image.edit.php:95 @@ -736,7 +732,7 @@ msgstr "Активно до" #: app/views/administration.usergroup.edit.php:144 #: app/views/administration.usergroup.edit.php:195 #: app/views/administration.usergroup.edit.php:234 -#: app/views/administration.userrole.edit.php:305 +#: app/views/administration.userrole.edit.php:295 #: app/views/administration.user.token.edit.php:84 #: app/views/configuration.correlation.edit.php:101 #: app/views/configuration.correlation.edit.php:173 @@ -751,7 +747,7 @@ msgstr "Активно до" #: app/views/js/reports.scheduledreport.edit.js.php:133 #: app/views/monitoring.dashboard.view.php:135 #: app/views/monitoring.dashboard.widget.edit.php:38 -#: app/views/popup.condition.common.php:667 +#: app/views/popup.condition.common.php:702 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73 #: app/views/popup.httpstep.php:99 app/views/popup.httpstep.php:123 #: app/views/popup.httpstep.php:142 app/views/popup.httpstep.php:181 @@ -764,22 +760,26 @@ msgstr "Активно до" #: app/views/popup.massupdate.item.php:124 #: app/views/popup.massupdate.item.php:270 #: app/views/popup.massupdate.item.php:480 +#: app/views/popup.massupdate.service.php:44 #: app/views/popup.massupdate.template.php:52 #: app/views/popup.massupdate.template.php:134 #: app/views/popup.massupdate.trigger.php:81 #: app/views/popup.massupdate.trigger.php:128 app/views/popup.media.php:52 -#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:95 +#: 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:134 +#: app/views/popup.scheduledreport.subscription.php:133 +#: app/views/popup.service.edit.php:87 app/views/popup.service.edit.php:144 +#: app/views/popup.service.edit.php:207 app/views/popup.service.edit.php:252 +#: app/views/popup.service.time.edit.php:155 #: app/views/popup.triggerwizard.php:116 app/views/popup.triggerwizard.php:150 -#: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:128 +#: app/views/popup.valuemap.edit.php:60 app/views/popup.valuemap.edit.php:126 #: include/classes/helpers/CTagFilterFieldHelper.php:92 #: include/classes/widgets/CWidgetHelper.php:518 include/forms.inc.php:1476 #: include/forms.inc.php:2040 include/views/configuration.action.edit.php:133 -#: include/views/configuration.action.edit.php:304 -#: include/views/configuration.action.edit.php:386 -#: include/views/configuration.action.edit.php:462 -#: include/views/configuration.action.edit.php:501 +#: include/views/configuration.action.edit.php:305 +#: include/views/configuration.action.edit.php:389 +#: include/views/configuration.action.edit.php:465 +#: include/views/configuration.action.edit.php:504 #: include/views/configuration.graph.edit.php:423 #: include/views/configuration.graph.edit.php:518 #: include/views/configuration.host.discovery.edit.php:154 @@ -813,9 +813,6 @@ msgstr "Активно до" #: include/views/configuration.maintenance.edit.php:86 #: include/views/configuration.maintenance.edit.php:200 #: include/views/configuration.maintenance.edit.php:275 -#: include/views/configuration.services.edit.php:164 -#: include/views/configuration.services.edit.php:340 -#: include/views/configuration.services.edit.php:379 #: include/views/configuration.template.edit.php:252 #: include/views/configuration.trigger.prototype.edit.php:111 #: include/views/configuration.trigger.prototype.edit.php:148 @@ -841,7 +838,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:193 +#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191 msgid "Add" msgstr "Добавить" @@ -849,23 +846,27 @@ msgstr "Добавить" msgid "Add (message type limit reached)" msgstr "Добавить (достигнуто максимальное количество типов сообщений)" -#: jsLoader.php:163 +#: jsLoader.php:161 msgid "Add a new widget" msgstr "Добавить новый виджет" -#: include/services.inc.php:75 include/services.inc.php:114 -msgid "Add child" -msgstr "Добавить потомка" - -#: jsLoader.php:194 +#: jsLoader.php:192 msgid "Add child element" msgstr "Добавить элемент потомка" +#: app/partials/monitoring.service.list.edit.php:122 +msgid "Add child service" +msgstr "" + +#: app/views/js/popup.service.edit.js.php:227 +msgid "Add child services" +msgstr "" + #: app/partials/configuration.valuemap.php:47 msgid "Add from" msgstr "Добавить с" -#: include/actions.inc.php:654 include/actions.inc.php:982 +#: include/actions.inc.php:686 include/actions.inc.php:1029 msgid "Add host" msgstr "Добавить узел сети" @@ -874,7 +875,7 @@ msgstr "Добавить узел сети" msgid "Add missing" msgstr "Добавить отсутствующее" -#: jsLoader.php:195 +#: jsLoader.php:193 msgid "Add multiple maps" msgstr "Добавить несколько карт" @@ -891,7 +892,11 @@ msgstr "Добавить новый интерфейс" msgid "Add new override" msgstr "Добавить новое замещение" -#: include/classes/helpers/CRoleHelper.php:495 +#: app/views/js/popup.service.edit.js.php:250 jsLoader.php:392 +msgid "Add parent services" +msgstr "" + +#: include/classes/helpers/CRoleHelper.php:492 msgid "Add problem comments" msgstr "Добавление комментариев к проблемам" @@ -913,11 +918,11 @@ msgstr "Добавить подкарты" msgid "Add to favourites" msgstr "Добавить в избранное" -#: include/actions.inc.php:986 +#: include/actions.inc.php:1033 msgid "Add to host group" msgstr "Добавить в группу узлов сети" -#: include/actions.inc.php:682 +#: include/actions.inc.php:714 msgid "Add to host groups" msgstr "Добавить в группы узлов сети" @@ -937,7 +942,7 @@ msgstr "Добавить виджет" msgid "Added" msgstr "Добавлено" -#: jsLoader.php:318 +#: jsLoader.php:316 #, c-format msgctxt "screen reader" msgid "Added, %1$s" @@ -947,7 +952,7 @@ msgstr "Добавлено, %1$s" msgid "Admin" msgstr "Администратор" -#: include/classes/helpers/CMenuHelper.php:311 +#: include/classes/helpers/CMenuHelper.php:313 #: include/classes/helpers/CRoleHelper.php:359 msgid "Administration" msgstr "Администрирование" @@ -956,11 +961,11 @@ msgstr "Администрирование" msgid "Advanced labels" msgstr "Расширенные подписи" -#: include/events.inc.php:285 +#: include/events.inc.php:288 msgid "Age" msgstr "Возраст" -#: app/partials/common.filter.trigger.php:108 +#: app/partials/common.filter.trigger.php:109 #: app/partials/monitoring.problem.filter.php:116 msgid "Age less than" msgstr "Возраст менее чем" @@ -970,7 +975,7 @@ msgstr "Возраст менее чем" msgid "Age less than %1$s" msgstr "Возраст меньше чем %1$s" -#: app/views/administration.script.list.php:158 include/hosts.inc.php:1270 +#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96 #: include/views/js/configuration.host.edit.js.php:175 msgid "Agent" @@ -1010,7 +1015,7 @@ msgstr "Функция агрегации" msgid "Aggregation interval" msgstr "Интервал агрегации" -#: include/actions.inc.php:2024 +#: include/actions.inc.php:2079 msgid "Alert message" msgstr "Сообщение оповещения" @@ -1027,13 +1032,13 @@ msgstr "Выровнять элементы карты" #: app/controllers/CControllerUserList.php:113 #: app/views/administration.script.edit.php:213 #: app/views/administration.script.edit.php:220 -#: app/views/administration.script.list.php:186 #: app/views/administration.script.list.php:187 -#: app/views/monitoring.dashboard.list.php:64 -#: app/views/reports.scheduledreport.list.php:55 +#: app/views/administration.script.list.php:188 +#: app/views/monitoring.dashboard.list.php:65 +#: 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:386 +#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384 msgid "All" msgstr "Все" @@ -1051,7 +1056,7 @@ msgstr "Все группы" msgid "All hosts" msgstr "Все узлы сети" -#: jsLoader.php:274 +#: jsLoader.php:272 msgid "All links should have \"Name\" and \"URL\" specified" msgstr "У всех ссылок должны быть указаны \"Имя\" и \"URL\"" @@ -1069,6 +1074,10 @@ msgstr "Все проблемы" msgid "All problems if tag values match" msgstr "Все проблемы если значения тегов совпадают" +#: app/controllers/CControllerServiceListGeneral.php:135 +msgid "All services" +msgstr "" + #: app/partials/administration.usergroup.tagfilters.html.php:47 msgid "All tags" msgstr "Все теги" @@ -1077,7 +1086,7 @@ msgstr "Все теги" msgid "All templates" msgstr "Все шаблоны" -#: app/views/administration.userrole.edit.php:205 +#: app/views/administration.userrole.edit.php:198 msgid "Allow list" msgstr "Список разрешений" @@ -1142,23 +1151,26 @@ msgstr "И" msgid "And/Or" msgstr "И/ИЛИ" -#: app/partials/common.filter.trigger.php:48 +#: app/partials/common.filter.trigger.php:49 #: app/partials/monitoring.host.filter.php:127 -#: app/views/administration.mediatype.list.php:54 -#: app/views/administration.module.list.php:51 -#: app/views/administration.proxy.list.php:49 -#: app/views/administration.script.list.php:49 +#: app/views/administration.mediatype.list.php:55 +#: app/views/administration.module.list.php:52 +#: app/views/administration.proxy.list.php:50 +#: app/views/administration.script.list.php:50 #: app/views/administration.token.list.php:94 -#: app/views/administration.usergroup.list.php:51 +#: app/views/administration.usergroup.list.php:52 #: app/views/administration.user.token.list.php:59 -#: app/views/configuration.correlation.list.php:54 -#: app/views/configuration.discovery.list.php:54 -#: app/views/reports.scheduledreport.list.php:61 +#: app/views/configuration.correlation.list.php:55 +#: app/views/configuration.discovery.list.php:55 +#: app/views/monitoring.service.list.edit.php:145 +#: app/views/monitoring.service.list.edit.php:173 +#: app/views/monitoring.service.list.php:136 +#: app/views/reports.scheduledreport.list.php:62 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:36 #: include/triggers.inc.php:1774 -#: include/views/configuration.action.list.php:73 +#: include/views/configuration.action.list.php:75 #: include/views/configuration.host.list.php:112 -#: include/views/configuration.maintenance.list.php:64 +#: include/views/configuration.maintenance.list.php:65 msgid "Any" msgstr "Любое" @@ -1175,15 +1187,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 -#: include/classes/html/CFilter.php:207 include/classes/html/CFilter.php:298 +#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:45 +#: 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:196 -#: jsLoader.php:309 +#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194 +#: jsLoader.php:307 msgid "Apply" msgstr "Применить" @@ -1191,8 +1203,8 @@ msgstr "Применить" msgid "Apply permissions and tag filters to all subgroups" msgstr "Применить права доступа и фильтры тегов ко всем подгруппам" -#: include/views/configuration.maintenance.list.php:66 -#: include/views/configuration.maintenance.list.php:100 +#: include/views/configuration.maintenance.list.php:67 +#: include/views/configuration.maintenance.list.php:101 msgctxt "maintenance status" msgid "Approaching" msgstr "Близится" @@ -1201,7 +1213,7 @@ msgstr "Близится" msgid "Apr" msgstr "Апр." -#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:226 +#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224 msgid "April" msgstr "Апрель" @@ -1272,7 +1284,7 @@ msgstr "В %1$s:%2$s на %3$s день каждый %4$s" msgid "At (hour:minute)" msgstr "В (час:минута)" -#: app/views/administration.userrole.edit.php:116 +#: app/views/administration.userrole.edit.php:114 #: include/classes/api/services/CRole.php:482 msgid "At least one UI element must be checked." msgstr "Необходимо выбрать по крайней мере один элемент интерфейса пользователей." @@ -1308,7 +1320,7 @@ msgstr "Должна поддерживаться по крайней мере msgid "At least one operation must be selected." msgstr "Должна быть выбрана по крайней мере одна операция." -#: include/views/configuration.action.edit.php:511 +#: include/views/configuration.action.edit.php:514 msgid "At least one operation must exist." msgstr "Должна существовать по крайней мере одна операция." @@ -1334,18 +1346,18 @@ msgstr "Интервал попыток" #: app/views/administration.mediatype.edit.php:336 httpconf.php:45 #: include/views/configuration.httpconf.edit.php:76 -#: include/views/configuration.httpconf.list.php:136 +#: include/views/configuration.httpconf.list.php:137 msgid "Attempts" msgstr "Попыток" -#: app/views/administration.housekeeping.edit.php:99 +#: app/views/administration.housekeeping.edit.php:108 #: include/classes/helpers/CMenuHelper.php:128 #: include/classes/helpers/CRoleHelper.php:413 msgid "Audit" msgstr "Аудит" #: app/controllers/CControllerAuditLogList.php:151 -#: app/views/reports.auditlog.list.php:75 +#: app/views/reports.auditlog.list.php:76 msgid "Audit log" msgstr "Журнал аудита" @@ -1353,7 +1365,7 @@ msgstr "Журнал аудита" msgid "Aug" msgstr "Авг" -#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:230 +#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228 msgid "August" msgstr "Август" @@ -1370,10 +1382,10 @@ msgstr "Запросы AuthN" #: app/views/administration.authentication.edit.php:255 #: app/views/administration.authentication.edit.php:265 #: app/views/administration.mediatype.edit.php:89 -#: include/classes/helpers/CMenuHelper.php:267 -#: include/classes/helpers/CRoleHelper.php:458 +#: include/classes/helpers/CMenuHelper.php:269 +#: include/classes/helpers/CRoleHelper.php:455 #: include/views/configuration.httpconf.edit.php:246 -#: include/views/configuration.httpconf.list.php:137 +#: include/views/configuration.httpconf.list.php:138 msgid "Authentication" msgstr "Аутентификация" @@ -1397,13 +1409,13 @@ msgid "Authentication method" msgstr "Метод аутентификации" #: app/views/popup.discovery.check.php:103 -#: app/views/popup.itemtestedit.view.php:201 +#: app/views/popup.itemtestedit.view.php:203 #: include/views/js/configuration.host.edit.js.php:123 msgid "Authentication passphrase" msgstr "Пароль аутентификации" #: app/views/popup.discovery.check.php:96 -#: app/views/popup.itemtestedit.view.php:190 +#: app/views/popup.itemtestedit.view.php:192 #: include/views/js/configuration.host.edit.js.php:117 msgid "Authentication protocol" msgstr "Протокол аутентификации" @@ -1413,7 +1425,7 @@ msgid "Authentication settings updated" msgstr "Настройки аутентификации обновлены" #: app/views/administration.module.edit.php:40 -#: app/views/administration.module.list.php:75 +#: app/views/administration.module.list.php:76 msgid "Author" msgstr "Автор" @@ -1462,18 +1474,18 @@ msgstr "Автоматический выбор иконки" #: app/controllers/CControllerAutoregEdit.php:67 #: app/views/administration.autoreg.edit.php:29 #: app/views/administration.autoreg.edit.php:89 -#: app/views/popup.mediatype.message.php:61 -#: include/classes/helpers/CMediatypeHelper.php:119 -#: include/classes/helpers/CMenuHelper.php:232 include/html.inc.php:879 +#: app/views/popup.mediatype.message.php:70 +#: include/classes/helpers/CMediatypeHelper.php:183 +#: include/classes/helpers/CMenuHelper.php:234 include/html.inc.php:879 msgid "Autoregistration" msgstr "Авторегистрация" -#: include/classes/helpers/CMenuHelper.php:189 -#: include/views/configuration.action.list.php:29 +#: include/classes/helpers/CMenuHelper.php:194 +#: include/views/configuration.action.list.php:30 msgid "Autoregistration actions" msgstr "Действия авторегистрации" -#: app/views/administration.housekeeping.edit.php:77 +#: app/views/administration.housekeeping.edit.php:86 msgid "Autoregistration data storage period" msgstr "Период хранения данных авторегистрации" @@ -1565,11 +1577,11 @@ msgstr "Битов для сдвига" msgid "Bitwise functions" msgstr "Битовые функции" -#: app/views/administration.user.list.php:143 +#: app/views/administration.user.list.php:144 msgid "Blocked" msgstr "Заблокирован" -#: include/classes/core/ZBase.php:363 +#: include/classes/core/ZBase.php:361 msgid "Blue" msgstr "Голубая" @@ -1623,11 +1635,11 @@ msgstr "Оба пароля должны совпадать." msgid "Bottom" msgstr "По нижнему краю" -#: jsLoader.php:266 +#: jsLoader.php:264 msgid "Bring forward" msgstr "Переместить вперёд" -#: jsLoader.php:265 +#: jsLoader.php:263 msgid "Bring to front" msgstr "На передний план" @@ -1643,8 +1655,8 @@ msgstr "По узлу сети" msgid "By trigger template" msgstr "По шаблону триггера" -#: app/views/administration.proxy.list.php:129 -#: app/views/administration.proxy.list.php:142 +#: app/views/administration.proxy.list.php:130 +#: app/views/administration.proxy.list.php:143 #: include/views/configuration.host.list.php:334 #: include/views/configuration.host.list.php:354 #: include/views/configuration.host.list.php:357 @@ -1655,7 +1667,7 @@ msgstr "CERT" #: app/views/monitoring.widget.problems.view.php:109 #: include/classes/graph/CSvgGraph.php:1080 #: include/classes/screens/CScreenProblem.php:982 -#: include/classes/screens/CScreenProblem.php:1192 include/events.inc.php:378 +#: include/classes/screens/CScreenProblem.php:1193 include/events.inc.php:381 msgid "CLOSING" msgstr "ЗАКРЫТИЕ" @@ -1690,7 +1702,7 @@ msgstr "Использование CPU в процентном отношени msgid "CPU utilisation percentage. Returns float" msgstr "Утилизация CPU в процентах. Возвращает число с плавающей точкой" -#: app/views/popup.itemtestedit.view.php:299 +#: app/views/popup.itemtestedit.view.php:301 msgid "CRLF" msgstr "CRLF" @@ -1698,16 +1710,12 @@ msgstr "CRLF" msgid "CSV to JSON" msgstr "CSV в JSON" -#: include/views/configuration.services.edit.php:91 services.php:40 -msgid "Calculate SLA, acceptable SLA (in %)" -msgstr "Вычислять SLA, допустимый уровень SLA (в %)" - #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176 #: include/views/configuration.graph.edit.php:263 msgid "Calculated" msgstr "Вычисляемое" -#: jsLoader.php:222 +#: jsLoader.php:220 msgid "Calendar" msgstr "Календарь" @@ -1715,12 +1723,12 @@ msgstr "Календарь" msgid "Callback" msgstr "Callback" -#: jsLoader.php:321 +#: jsLoader.php:319 msgctxt "screen reader" msgid "Can not be removed" msgstr "Нельзя удалить" -#: app/partials/scheduledreport.formgrid.html.php:221 +#: app/partials/scheduledreport.formgrid.html.php:219 #: app/views/administration.iconmap.edit.php:145 #: app/views/administration.iconmap.edit.php:155 #: app/views/administration.image.edit.php:86 @@ -1735,13 +1743,13 @@ msgstr "Нельзя удалить" #: app/views/administration.user.edit.php:606 #: app/views/administration.user.edit.php:637 #: app/views/administration.usergroup.edit.php:214 -#: app/views/administration.userrole.edit.php:276 +#: app/views/administration.userrole.edit.php:266 #: app/views/administration.user.token.edit.php:78 #: app/views/configuration.correlation.edit.php:167 #: app/views/configuration.dashboard.edit.php:67 #: app/views/configuration.discovery.edit.php:140 #: app/views/js/administration.gui.edit.js.php:35 -#: app/views/js/administration.housekeeping.edit.js.php:74 +#: app/views/js/administration.housekeeping.edit.js.php:75 #: app/views/js/administration.miscconfig.edit.js.php:45 #: app/views/js/administration.trigdisplay.edit.js.php:51 #: app/views/js/popup.import.js.php:60 app/views/js/popup.import.js.php:154 @@ -1749,8 +1757,8 @@ msgstr "Нельзя удалить" #: 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:197 -#: jsLoader.php:207 jsLoader.php:310 jsLoader.php:382 +#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195 +#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380 msgid "Cancel" msgstr "Отмена" @@ -1772,7 +1780,7 @@ msgstr "Не удалось добавить не числовой элемен msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"." msgstr "Не удалось добавить не числовой элемент данных \"%1$s\" к прототипу графика \"%2$s\"." -#: actionconf.php:178 +#: actionconf.php:179 msgid "Cannot add action" msgstr "Не удалось добавить действие" @@ -1780,7 +1788,7 @@ msgstr "Не удалось добавить действие" msgid "Cannot add correlation" msgstr "Не удалось добавить корреляцию" -#: jsLoader.php:147 +#: jsLoader.php:145 #, c-format msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added." msgstr "Не удалось добавить страницу панели: уже добавлено максимальное количество %1$d страниц панелей" @@ -1889,10 +1897,6 @@ msgstr "Не удалось добавить регулярный отчет" msgid "Cannot add script" msgstr "Не удалось добавить скрипт" -#: services.php:152 -msgid "Cannot add service" -msgstr "Невозможно добавить услугу" - #: app/views/monitoring.widget.navtreeitem.edit.php:63 msgid "Cannot add submaps. Max depth reached." msgstr "Не удалось добавить подкарты. Достигнута максимальная глубина." @@ -1923,7 +1927,7 @@ msgstr "Не удалось добавить группу пользовател msgid "Cannot add web scenario" msgstr "Не удалось добавить веб-сценарий" -#: jsLoader.php:148 +#: jsLoader.php:146 msgid "Cannot add widget: not enough free space on the dashboard." msgstr "Не удалось добавить виджет: не хватает свободного места на ПАНЕЛИ." @@ -1954,7 +1958,7 @@ msgstr "Не удалось очистить историю: по крайней msgid "Cannot clone graph prototypes." msgstr "Не удалось клонировать прототипы графиков." -#: include/classes/api/services/CDiscoveryRule.php:2567 +#: include/classes/api/services/CDiscoveryRule.php:2568 msgid "Cannot clone host prototypes." msgstr "Не удалось клонировать прототипы узлов сети." @@ -1968,7 +1972,7 @@ msgstr "Не удалось клонировать прототипы элеме msgid "Cannot clone trigger prototypes." msgstr "Не удалось клонировать прототипы триггеров." -#: include/classes/api/services/CEvent.php:847 +#: include/classes/api/services/CEvent.php:848 #, c-format msgid "Cannot close problem: %1$s." msgstr "Не удалось закрыть проблему: %1$s." @@ -2067,7 +2071,7 @@ msgstr[2] "Не удалось удалить API токены" msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user." msgstr "Невозможно удалить внутреннего пользователя Zabbix \"%1$s\", попробуйте отключить его." -#: actionconf.php:199 +#: actionconf.php:200 msgid "Cannot delete action" msgstr "Не удалось удалить действие" @@ -2243,13 +2247,17 @@ msgstr[2] "Не удалось удалить скрипты" msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"." msgstr "Не удалось удалить скрипты. Скрипт \"%1$s\" используется в операции действия \"%2$s\"." -#: actionconf.php:393 +#: actionconf.php:394 msgid "Cannot delete selected actions" msgstr "Не удалось удалить выбранные действия" -#: services.php:107 +#: app/controllers/CControllerServiceDelete.php:67 +#, fuzzy msgid "Cannot delete service" -msgstr "Не удалось удалить услугу" +msgid_plural "Cannot delete services" +msgstr[0] "Не удалось удалить услугу" +msgstr[1] "Не удалось удалить услугу" +msgstr[2] "Не удалось удалить услугу" #: templates.php:432 templates.php:446 templates.php:479 msgid "Cannot delete template" @@ -2263,7 +2271,7 @@ msgstr "Не удалось удалить прототип графиков у msgid "Cannot delete templated graph." msgstr "Не удалось удалить график унаследованный из шаблона." -#: include/classes/api/services/CHostPrototype.php:1297 +#: include/classes/api/services/CHostPrototype.php:1302 msgid "Cannot delete templated host prototype." msgstr "Невозможно удалить прототип узлов сети унаследованный из шаблона." @@ -2342,7 +2350,7 @@ msgstr[0] "Не удалось деактивировать API токен" msgstr[1] "Не удалось деактивировать API токены" msgstr[2] "Не удалось деактивировать API токены" -#: actionconf.php:382 +#: actionconf.php:383 msgid "Cannot disable action" msgid_plural "Cannot disable actions" msgstr[0] "Не удалось деактивировать действие" @@ -2431,7 +2439,7 @@ msgstr[0] "Не удалось активировать API токен" msgstr[1] "Не удалось активировать API токены" msgstr[2] "Не удалось активировать API токены" -#: actionconf.php:381 +#: actionconf.php:382 msgid "Cannot enable action" msgid_plural "Cannot enable actions" msgstr[0] "Не удалось активировать действие" @@ -2511,7 +2519,7 @@ msgstr "Не удалось раскрыть выражение" msgid "Cannot execute script." msgstr "Не удалось выполнить скрипт." -#: jsLoader.php:277 +#: jsLoader.php:275 msgid "Cannot expand macros." msgstr "Не удалось раскрыть макросы." @@ -2644,14 +2652,6 @@ 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 "Не удалось построить дерево. Проверьте логическую структуру в соединениях между услугами." - -#: services.php:353 -msgid "Cannot format tree." -msgstr "Не удалось построить дерево." - #: include/classes/api/services/CTemplate.php:946 msgid "Cannot have empty visible template name." msgstr "Видимое имя шаблона не может быть пустым." @@ -2679,7 +2679,7 @@ msgid "Cannot link template." msgstr "Не удалось присоединить шаблон." #: app/controllers/CControllerModuleEdit.php:106 -#: include/classes/core/ZBase.php:704 +#: include/classes/core/ZBase.php:702 #, c-format msgid "Cannot load module at: %1$s." msgid_plural "Cannot load modules at: %1$s." @@ -2778,7 +2778,7 @@ msgstr "Не удалось отправить запрос" msgid "Cannot send request: %1$s." msgstr "Не удалось отправить запрос: %1$s." -#: include/classes/api/services/CAction.php:2743 +#: include/classes/api/services/CAction.php:2760 #, c-format msgid "Cannot set \"%1$s\" for action \"%2$s\"." msgstr "Не удалось установить \"%1$s\" для действия \"%2$s\"." @@ -2808,7 +2808,7 @@ msgstr "Невозможно задать поля инвентарных дан msgid "Cannot set session cookie." msgstr "Не удалось установить cookie сессии." -#: jsLoader.php:285 +#: jsLoader.php:283 msgid "Cannot support notification audio for this device." msgstr "Поддержка аудио оповещений отсутствует для этого устройства." @@ -2846,8 +2846,8 @@ msgstr "Не удалось отсоединить шаблон." msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host." msgstr "Не удалось отсоединить триггер \"%1$s\", у него имеются элементы данных с шаблона, который остается присоединённым к узлу сети." -#: include/classes/api/services/CAction.php:2883 -#: include/classes/api/services/CAction.php:2888 +#: include/classes/api/services/CAction.php:2901 +#: include/classes/api/services/CAction.php:2906 #, c-format msgid "Cannot update \"%1$s\" for action \"%2$s\"." msgstr "Не удалось обновить \"%1$s\" для действия \"%2$s\"." @@ -2917,7 +2917,7 @@ msgstr "Невозможно обновить обнаруженную груп msgid "Cannot update a templated web scenario \"%1$s\": %2$s." msgstr "Не удалось обновить унаследованный из шаблона веб-сценарий \"%1$s\": %2$s." -#: actionconf.php:170 +#: actionconf.php:171 msgid "Cannot update action" msgstr "Не удалось обновить действие" @@ -2929,8 +2929,8 @@ msgstr "Не удалось обновить аутентификацию" #: app/controllers/CControllerAutoregUpdate.php:73 #: app/controllers/CControllerGuiUpdate.php:53 #: app/controllers/CControllerGuiUpdate.php:101 -#: app/controllers/CControllerHousekeepingUpdate.php:67 -#: app/controllers/CControllerHousekeepingUpdate.php:140 +#: app/controllers/CControllerHousekeepingUpdate.php:68 +#: app/controllers/CControllerHousekeepingUpdate.php:142 #: app/controllers/CControllerMiscConfigUpdate.php:59 #: app/controllers/CControllerMiscConfigUpdate.php:122 #: app/controllers/CControllerTrigDisplayUpdate.php:59 @@ -3088,9 +3088,9 @@ msgstr "Не удалось обновить скрипт" msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"." msgstr "Не удалось обновить область использования скрипта. Скрипт \"%1$s\" используется в действии \"%2$s\"." -#: services.php:146 -msgid "Cannot update service" -msgstr "Невозможно обновить услугу" +#: app/controllers/CControllerPopupMassupdateService.php:156 +msgid "Cannot update services" +msgstr "" #: include/classes/api/services/CHttpTest.php:538 #: include/classes/api/services/CHttpTest.php:738 @@ -3117,7 +3117,7 @@ msgstr "Не удалось обновить шаблоны для обнару msgid "Cannot update trigger" msgstr "Не удалось обновить триггер" -#: include/classes/api/services/CTriggerGeneral.php:1928 +#: include/classes/api/services/CTriggerGeneral.php:1914 #, c-format msgid "Cannot update trigger \"%1$s\": %2$s." msgstr "Не удалось обновить триггер \"%1$s\": %2$s." @@ -3130,7 +3130,7 @@ msgstr[0] "Не удалось обновить прототип триггер msgstr[1] "Не удалось обновить прототипы триггеров" msgstr[2] "Не удалось обновить прототипы триггеров" -#: include/classes/api/services/CTriggerGeneral.php:1763 +#: include/classes/api/services/CTriggerGeneral.php:1749 #, c-format msgid "Cannot update trigger prototype \"%1$s\": %2$s." msgstr "Не удалось обновить прототип триггера \"%1$s\": %2$s." @@ -3211,7 +3211,6 @@ msgstr "Изменение" #: app/partials/hostmacros.inherited.list.html.php:111 #: include/classes/screens/CScreenBase.php:361 #: include/classes/screens/CScreenMap.php:45 -#: include/views/configuration.services.edit.php:67 #: include/views/js/common.template.edit.js.php:187 msgctxt "verb" msgid "Change" @@ -3315,7 +3314,7 @@ msgid "Check type" msgstr "Тип проверки" #: app/views/configuration.discovery.edit.php:75 -#: app/views/configuration.discovery.list.php:79 +#: app/views/configuration.discovery.list.php:80 msgid "Checks" msgstr "Проверки" @@ -3376,6 +3375,10 @@ msgstr "Проверяется производительность UDP серв msgid "Checks should be unique." msgstr "Проверки должны быть уникальными." +#: app/views/popup.service.edit.php:217 app/views/popup.service.edit.php:230 +msgid "Child services" +msgstr "" + #: include/locales.inc.php:50 msgid "Chinese (zh_CN)" msgstr "Китайский (zh_CN)" @@ -3393,13 +3396,13 @@ msgstr "Закольцованная ссылка в шаблонах: %1$s." msgid "Circular template linkage is not allowed." msgstr "Закольцованное соединение шаблонов не допускается." -#: include/classes/core/ZBase.php:530 +#: include/classes/core/ZBase.php:528 #, c-format msgid "Class %1$s not found for action %2$s." msgstr "Класс %1$s не найден для действия %2$s." -#: include/views/configuration.httpconf.list.php:216 -#: include/views/configuration.item.list.php:293 +#: include/views/configuration.httpconf.list.php:217 +#: include/views/configuration.item.list.php:291 msgid "Clear history" msgstr "Очистить историю" @@ -3414,11 +3417,11 @@ msgstr "Очистить историю и динамику изменений" msgid "Clear when unlinking" msgstr "Очистить при отсоединении" -#: jsLoader.php:164 +#: jsLoader.php:162 msgid "Click and drag to desired size." msgstr "Нажмите и переместите до желаемого размера." -#: jsLoader.php:308 +#: jsLoader.php:306 msgid "Click to view or edit" msgstr "Нажмите для просмотра или изменения" @@ -3426,16 +3429,16 @@ msgstr "Нажмите для просмотра или изменения" msgid "Clock" msgstr "Часы" -#: app/partials/scheduledreport.formgrid.html.php:231 +#: app/partials/scheduledreport.formgrid.html.php:229 #: app/views/administration.iconmap.edit.php:138 #: app/views/administration.mediatype.edit.php:364 #: app/views/administration.proxy.edit.php:166 #: app/views/administration.regex.edit.php:147 #: app/views/administration.script.edit.php:284 -#: app/views/administration.userrole.edit.php:286 +#: app/views/administration.userrole.edit.php:276 #: app/views/configuration.correlation.edit.php:178 #: app/views/configuration.discovery.edit.php:155 -#: include/views/configuration.action.edit.php:490 +#: include/views/configuration.action.edit.php:493 #: include/views/configuration.graph.edit.php:510 #: include/views/configuration.host.discovery.edit.php:892 #: include/views/configuration.host.edit.php:537 @@ -3448,7 +3451,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:332 +#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330 msgid "Clone" msgstr "Клонировать" @@ -3459,8 +3462,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:208 -#: jsLoader.php:287 jsLoader.php:304 jsLoader.php:375 +#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206 +#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373 msgid "Close" msgstr "Закрыть" @@ -3485,13 +3488,13 @@ msgstr "Закрыть старые события" msgid "Close problem" msgstr "Закрыть проблему" -#: include/classes/helpers/CRoleHelper.php:498 +#: include/classes/helpers/CRoleHelper.php:495 msgid "Close problems" msgstr "Закрытие проблем" #: include/classes/html/CCollapsibleUiWidget.php:55 -#: include/classes/widgets/CWidgetHelper.php:970 jsLoader.php:298 -#: jsLoader.php:303 +#: include/classes/widgets/CWidgetHelper.php:970 jsLoader.php:296 +#: jsLoader.php:301 msgid "Collapse" msgstr "Свернуть" @@ -3508,7 +3511,7 @@ msgstr "Свернуть боковую панель" msgid "Colour" msgstr "Цвет" -#: include/classes/validators/CColorValidator.php:32 jsLoader.php:279 +#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277 #, c-format msgid "Colour \"%1$s\" is not correct: expecting hexadecimal colour code (6 symbols)." msgstr "Цвет \"%1$s\" не корректный: ожидается шестнадцатеричный код цвета (6 символов)." @@ -3525,13 +3528,13 @@ msgstr "Столбцов" msgid "Combined result" msgstr "Комбинированный результат" -#: app/views/administration.script.edit.php:174 include/actions.inc.php:1861 -#: include/views/administration.auditacts.list.php:102 +#: app/views/administration.script.edit.php:174 include/actions.inc.php:1916 +#: include/views/administration.auditacts.list.php:103 msgid "Command" msgstr "Команда" #: app/views/administration.script.edit.php:167 -#: app/views/administration.script.list.php:78 +#: app/views/administration.script.list.php:79 msgid "Commands" msgstr "Команды" @@ -3548,7 +3551,7 @@ msgstr "Community" msgid "Compact view" msgstr "Компактный вид" -#: include/classes/api/services/CAction.php:2597 +#: include/classes/api/services/CAction.php:2612 msgid "Comparing several triggers with \"and\" is not allowed." msgstr "Сравнение нескольких триггеров с условием \"и\" запрещено." @@ -3562,11 +3565,11 @@ msgstr "Компонент %1$s уже зарегистрирован." msgid "Component %1$s is not registered." msgstr "Компонент %1$s не зарегистрирован." -#: app/views/administration.housekeeping.edit.php:169 +#: app/views/administration.housekeeping.edit.php:178 msgid "Compress records older than" msgstr "Сжатие записей старше чем" -#: app/views/administration.proxy.list.php:75 +#: app/views/administration.proxy.list.php:76 msgid "Compression" msgstr "Сжатие" @@ -3579,7 +3582,7 @@ msgstr "Одновременные сессии" msgid "Condition" msgstr "Условие" -#: include/classes/api/services/CAction.php:2596 +#: include/classes/api/services/CAction.php:2611 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"." msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" действия \"%1$s\"." @@ -3599,7 +3602,7 @@ msgstr "Условие \"%2$s\" не используется в формуле msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"." msgstr "Условие \"%2$s\" не используется в \"%3$s\" формуле замещением \"%1$s\"." -#: include/classes/api/services/CAction.php:2595 +#: include/classes/api/services/CAction.php:2610 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined." msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" действия \"%1$s\" не определено." @@ -3621,9 +3624,9 @@ msgstr "Условие \"%2$s\" используемое в формуле \"%3$ #: app/partials/popup.operations.php:254 #: app/views/configuration.correlation.edit.php:128 -#: app/views/configuration.correlation.list.php:75 +#: app/views/configuration.correlation.list.php:76 #: include/views/configuration.action.edit.php:141 -#: include/views/configuration.action.list.php:96 +#: include/views/configuration.action.list.php:98 msgid "Conditions" msgstr "Условия" @@ -3633,9 +3636,9 @@ msgid "Conditions duplicates for correlation \"%1$s\"." msgstr "Дубликаты условий для корреляции \"%1$s\"." #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275 -#: include/classes/helpers/CMenuHelper.php:219 +#: include/classes/helpers/CMenuHelper.php:221 #: include/classes/helpers/CRoleHelper.php:355 -#: include/views/inventory.host.view.php:222 jsLoader.php:331 +#: include/views/inventory.host.view.php:222 jsLoader.php:329 msgid "Configuration" msgstr "Настройка" @@ -3694,7 +3697,7 @@ msgstr "Настройка прототипов узлов сети" msgid "Configuration of hosts" msgstr "Настройка узлов сети" -#: app/controllers/CControllerHousekeepingEdit.php:117 +#: app/controllers/CControllerHousekeepingEdit.php:121 msgid "Configuration of housekeeping" msgstr "Настройка очистки истории" @@ -3724,7 +3727,7 @@ msgstr "Настройка макросов" msgid "Configuration of maintenance periods" msgstr "Настройка периодов обслуживания" -#: app/controllers/CControllerMediatypeEdit.php:240 +#: app/controllers/CControllerMediatypeEdit.php:254 #: app/controllers/CControllerMediatypeList.php:140 msgid "Configuration of media types" msgstr "Настройка способов оповещения" @@ -3748,10 +3751,6 @@ msgstr "Настройка регулярных выражений" msgid "Configuration of scripts" msgstr "Настройка скриптов" -#: services.php:27 -msgid "Configuration of services" -msgstr "Настройка сервисов" - #: templates.php:27 msgid "Configuration of templates" msgstr "Настройка шаблонов" @@ -3789,7 +3788,7 @@ msgstr "Настройка веб-мониторинга" #: app/controllers/CControllerAutoregUpdate.php:69 #: app/controllers/CControllerGuiUpdate.php:97 -#: app/controllers/CControllerHousekeepingUpdate.php:136 +#: app/controllers/CControllerHousekeepingUpdate.php:138 #: app/controllers/CControllerMiscConfigUpdate.php:119 #: app/controllers/CControllerTrigDisplayUpdate.php:108 msgid "Configuration updated" @@ -3899,8 +3898,8 @@ msgstr "Подключения к узлу сети" msgid "Connections to proxy" msgstr "Подключения к прокси" -#: include/views/monitoring.sysmap.list.php:79 #: include/views/monitoring.sysmap.list.php:80 +#: include/views/monitoring.sysmap.list.php:81 msgid "Constructor" msgstr "Конструктор" @@ -3912,6 +3911,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:103 #: include/classes/helpers/CTagFilterFieldHelper.php:69 #: include/classes/helpers/CTagFilterFieldHelper.php:124 #: include/classes/widgets/CWidgetHelper.php:479 @@ -3948,28 +3948,30 @@ msgstr "Содержит" #: app/views/monitoring.latest.view.php:40 #: app/views/monitoring.map.view.php:71 #: app/views/monitoring.problem.view.php:103 -#: app/views/monitoring.web.view.php:42 app/views/report.services.php:76 +#: app/views/monitoring.service.list.edit.php:208 +#: app/views/monitoring.service.list.php:174 +#: app/views/monitoring.web.view.php:42 #: app/views/reports.scheduledreport.list.php:41 httpdetails.php:192 #: include/classes/html/widget/CWidget.php:128 -#: include/views/configuration.action.list.php:59 +#: include/views/configuration.action.list.php:60 #: include/views/configuration.graph.list.php:38 #: include/views/configuration.graph.list.php:59 #: include/views/configuration.host.discovery.list.php:47 #: include/views/configuration.hostgroups.list.php:37 #: include/views/configuration.host.list.php:41 #: include/views/configuration.host.prototype.list.php:37 -#: include/views/configuration.httpconf.list.php:105 +#: include/views/configuration.httpconf.list.php:106 #: include/views/configuration.item.list.php:46 #: include/views/configuration.item.prototype.list.php:37 #: include/views/configuration.maintenance.list.php:35 #: include/views/configuration.template.list.php:102 #: include/views/configuration.trigger.prototype.list.php:36 -#: include/views/configuration.triggers.list.php:159 +#: include/views/configuration.triggers.list.php:160 #: include/views/monitoring.history.php:240 #: 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 "Управление содержимым" @@ -3982,7 +3984,7 @@ msgid "Content menu" msgstr "Меню содержимого" #: app/views/popup.discovery.check.php:81 -#: app/views/popup.itemtestedit.view.php:153 include/items.inc.php:1306 +#: app/views/popup.itemtestedit.view.php:155 include/items.inc.php:1306 #: include/views/js/configuration.host.edit.js.php:95 msgid "Context name" msgstr "Имя контекста" @@ -4006,10 +4008,10 @@ msgid "Coordinates" msgstr "Координаты" #: include/views/configuration.copy.elements.php:77 -#: include/views/configuration.graph.list.php:237 -#: include/views/configuration.item.list.php:309 -#: include/views/configuration.triggers.list.php:342 jsLoader.php:149 -#: jsLoader.php:175 jsLoader.php:271 +#: 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 msgid "Copy" msgstr "Копировать" @@ -4063,7 +4065,7 @@ msgstr "У корреляции отсутствуют параметры: %1$s" msgid "Correlation name cannot be empty." msgstr "Имя корреляции не может быть пустым." -#: include/events.inc.php:225 +#: include/events.inc.php:228 msgid "Correlation rule" msgstr "Правило корреляции" @@ -4113,19 +4115,19 @@ msgstr "Количество значений в очереди на предв msgid "Create API token" msgstr "Создать API токен" -#: include/views/configuration.action.list.php:56 +#: include/views/configuration.action.list.php:57 msgid "Create action" msgstr "Создать действие" -#: include/classes/helpers/CRoleHelper.php:486 +#: include/classes/helpers/CRoleHelper.php:483 msgid "Create and edit dashboards" msgstr "Создание и изменение панелей" -#: include/classes/helpers/CRoleHelper.php:491 +#: include/classes/helpers/CRoleHelper.php:488 msgid "Create and edit maintenance" msgstr "Создание и изменение обслуживаний" -#: include/classes/helpers/CRoleHelper.php:487 +#: include/classes/helpers/CRoleHelper.php:484 msgid "Create and edit maps" msgstr "Создание и изменение карт" @@ -4142,11 +4144,11 @@ msgstr "Создать корреляцию" msgid "Create dashboard" msgstr "Создать панель" -#: jsLoader.php:336 +#: jsLoader.php:334 msgid "Create dependent discovery rule" msgstr "Создать зависимое правило обнаружения" -#: jsLoader.php:335 +#: jsLoader.php:333 msgid "Create dependent item" msgstr "Создать зависимый элемент данных" @@ -4263,7 +4265,7 @@ msgstr "Создать карту сети" msgid "Create media type" msgstr "Создать способ оповещения" -#: app/views/popup.import.php:130 jsLoader.php:333 +#: app/views/popup.import.php:130 jsLoader.php:331 msgid "Create new" msgstr "Создать новое" @@ -4279,19 +4281,23 @@ msgstr "Создать отчет" msgid "Create script" msgstr "Создать скрипт" +#: app/views/monitoring.service.list.edit.php:194 +msgid "Create service" +msgstr "" + #: include/views/configuration.template.list.php:90 msgid "Create template" msgstr "Создать шаблон" -#: include/views/configuration.triggers.list.php:148 jsLoader.php:334 +#: include/views/configuration.triggers.list.php:149 jsLoader.php:332 msgid "Create trigger" msgstr "Создать триггер" -#: include/views/configuration.triggers.list.php:156 +#: include/views/configuration.triggers.list.php:157 msgid "Create trigger (select host first)" msgstr "Создать триггер (сначала выберите узел сети)" -#: include/views/configuration.triggers.list.php:157 +#: include/views/configuration.triggers.list.php:158 msgid "Create trigger (select template first)" msgstr "Создать триггер (выберите сначала шаблон)" @@ -4319,15 +4325,15 @@ msgstr "Создать группу пользователей" msgid "Create user role" msgstr "Создать роль пользователя" -#: include/views/configuration.httpconf.list.php:94 +#: include/views/configuration.httpconf.list.php:95 msgid "Create web scenario" msgstr "Создать веб-сценарий" -#: include/views/configuration.httpconf.list.php:102 +#: include/views/configuration.httpconf.list.php:103 msgid "Create web scenario (select host first)" msgstr "Создать веб-сценарий (сначала выберите узел сети)" -#: include/views/configuration.httpconf.list.php:103 +#: include/views/configuration.httpconf.list.php:104 msgid "Create web scenario (select template first)" msgstr "Создать веб-сценарий (выберите сначала шаблон)" @@ -4336,8 +4342,8 @@ msgstr "Создать веб-сценарий (выберите сначала msgid "Created at" msgstr "Создано в" -#: app/views/monitoring.dashboard.list.php:65 -#: app/views/reports.scheduledreport.list.php:56 +#: app/views/monitoring.dashboard.list.php:66 +#: app/views/reports.scheduledreport.list.php:57 msgid "Created by me" msgstr "Созданы мной" @@ -4358,7 +4364,7 @@ msgstr "Критичная" msgid "Current host" msgstr "Текущий узел сети" -#: app/views/popup.scheduledreport.subscription.php:105 +#: app/views/popup.scheduledreport.subscription.php:104 msgid "Current user" msgstr "Текущий пользователь" @@ -4453,12 +4459,12 @@ msgstr "DNS имя" #: app/partials/scheduledreport.formgrid.html.php:102 #: app/partials/scheduledreport.table.html.php:49 -#: app/views/popup.maintenance.period.php:76 app/views/report.services.php:44 -#: include/maintenances.inc.php:27 report4.php:88 +#: app/views/popup.maintenance.period.php:76 include/maintenances.inc.php:27 +#: report4.php:88 msgid "Daily" msgstr "Ежедневно" -#: include/classes/core/ZBase.php:364 +#: include/classes/core/ZBase.php:362 msgid "Dark" msgstr "Темная" @@ -4534,7 +4540,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:337 +#: include/views/inventory.host.view.php:172 jsLoader.php:335 msgid "Dashboards" msgstr "Панели" @@ -4566,11 +4572,11 @@ msgstr "Обзор данных" msgid "Data set" msgstr "Набор данных" -#: app/views/administration.housekeeping.edit.php:92 -#: app/views/administration.housekeeping.edit.php:105 -#: app/views/administration.housekeeping.edit.php:118 -#: app/views/administration.housekeeping.edit.php:135 -#: app/views/administration.housekeeping.edit.php:152 +#: app/views/administration.housekeeping.edit.php:101 +#: app/views/administration.housekeeping.edit.php:114 +#: app/views/administration.housekeeping.edit.php:127 +#: app/views/administration.housekeeping.edit.php:144 +#: app/views/administration.housekeeping.edit.php:161 msgid "Data storage period" msgstr "Период хранения данных" @@ -4681,7 +4687,7 @@ msgstr "Дата покупки HW" msgid "Date and time functions" msgstr "Функции даты и времени" -#: app/views/report.services.php:83 report4.php:175 +#: report4.php:175 msgid "Day" msgstr "День" @@ -4704,13 +4710,13 @@ msgstr "День недели" msgid "Days" msgstr "Дни" -#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:366 +#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364 msgid "Debug" msgstr "Отладка" #: app/views/administration.usergroup.edit.php:99 -#: app/views/administration.usergroup.list.php:76 -#: app/views/administration.user.list.php:115 +#: app/views/administration.usergroup.list.php:77 +#: app/views/administration.user.list.php:116 msgid "Debug mode" msgstr "Режим отладки" @@ -4718,7 +4724,7 @@ msgstr "Режим отладки" msgid "Dec" msgstr "Дек." -#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:234 +#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232 msgid "December" msgstr "Декабрь" @@ -4729,11 +4735,11 @@ msgstr "Число десятичных знаков" #: app/views/administration.iconmap.edit.php:108 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31 -#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:231 +#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232 #: 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:260 +#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258 msgid "Default" msgstr "По умолчанию" @@ -4742,15 +4748,15 @@ msgstr "По умолчанию" msgid "Default (%1$s)" msgstr "По умолчанию (%1$s)" -#: app/views/administration.userrole.edit.php:123 +#: app/views/administration.userrole.edit.php:120 msgid "Default access to new UI elements" msgstr "Доступ по умолчанию к новым элементам интерфейса" -#: app/views/administration.userrole.edit.php:266 +#: app/views/administration.userrole.edit.php:256 msgid "Default access to new actions" msgstr "Доступ по умолчанию к новым действиям" -#: app/views/administration.userrole.edit.php:175 +#: app/views/administration.userrole.edit.php:169 msgid "Default access to new modules" msgstr "Доступ по умолчанию к новым модулям" @@ -4775,7 +4781,7 @@ msgstr "Диалог входа в систему по умолчанию" msgid "Default media type" msgstr "Тип способа оповещения по умолчанию" -#: actionconf.php:53 include/views/configuration.action.edit.php:155 +#: actionconf.php:54 include/views/configuration.action.edit.php:155 msgid "Default operation step duration" msgstr "Длительность шага операции по умолчанию" @@ -4803,53 +4809,55 @@ msgid "Delayed by" msgstr "Задерживается на" #: app/controllers/CControllerAuditLogList.php:170 -#: app/partials/scheduledreport.formgrid.html.php:235 +#: app/partials/monitoring.service.list.edit.php:132 +#: app/partials/monitoring.service.list.edit.php:143 +#: app/partials/scheduledreport.formgrid.html.php:233 #: app/views/administration.iconmap.edit.php:139 #: app/views/administration.image.edit.php:79 #: app/views/administration.mediatype.edit.php:365 -#: app/views/administration.mediatype.list.php:176 +#: app/views/administration.mediatype.list.php:177 #: app/views/administration.proxy.edit.php:167 -#: app/views/administration.proxy.list.php:177 +#: app/views/administration.proxy.list.php:178 #: app/views/administration.regex.edit.php:148 #: app/views/administration.regex.list.php:91 #: app/views/administration.script.edit.php:285 -#: app/views/administration.script.list.php:197 +#: app/views/administration.script.list.php:198 #: app/views/administration.token.edit.php:111 #: app/views/administration.token.list.php:202 #: app/views/administration.user.edit.php:615 #: app/views/administration.usergroup.edit.php:223 -#: app/views/administration.usergroup.list.php:236 -#: app/views/administration.user.list.php:250 -#: app/views/administration.userrole.edit.php:287 -#: app/views/administration.userrole.list.php:126 +#: app/views/administration.usergroup.list.php:237 +#: app/views/administration.user.list.php:251 +#: app/views/administration.userrole.edit.php:277 +#: app/views/administration.userrole.list.php:127 #: app/views/administration.user.token.edit.php:92 #: app/views/administration.user.token.list.php:153 #: app/views/configuration.correlation.edit.php:179 -#: app/views/configuration.correlation.list.php:148 +#: app/views/configuration.correlation.list.php:149 #: app/views/configuration.dashboard.list.php:67 #: app/views/configuration.discovery.edit.php:156 -#: app/views/configuration.discovery.list.php:121 -#: app/views/monitoring.dashboard.list.php:122 +#: app/views/configuration.discovery.list.php:122 +#: app/views/monitoring.dashboard.list.php:123 #: app/views/popup.tabfilter.edit.php:71 -#: app/views/reports.scheduledreport.list.php:95 +#: app/views/reports.scheduledreport.list.php:96 #: include/classes/html/CButtonDelete.php:25 #: include/classes/widgets/CWidgetHelper.php:663 -#: include/classes/widgets/CWidgetHelper.php:1015 include/services.inc.php:118 -#: include/views/configuration.action.list.php:161 -#: include/views/configuration.graph.list.php:239 -#: include/views/configuration.host.discovery.list.php:332 -#: include/views/configuration.hostgroups.list.php:198 +#: include/classes/widgets/CWidgetHelper.php:1015 +#: include/views/configuration.action.list.php:165 +#: include/views/configuration.graph.list.php:240 +#: include/views/configuration.host.discovery.list.php:333 +#: include/views/configuration.hostgroups.list.php:199 #: include/views/configuration.host.list.php:449 #: include/views/configuration.host.prototype.list.php:193 -#: include/views/configuration.httpconf.list.php:223 -#: include/views/configuration.item.list.php:316 +#: include/views/configuration.httpconf.list.php:224 +#: include/views/configuration.item.list.php:314 #: include/views/configuration.item.prototype.list.php:201 -#: include/views/configuration.maintenance.list.php:123 +#: include/views/configuration.maintenance.list.php:124 #: include/views/configuration.template.list.php:283 #: include/views/configuration.trigger.prototype.list.php:207 -#: include/views/configuration.triggers.list.php:349 -#: include/views/monitoring.sysmap.list.php:109 jsLoader.php:150 -#: jsLoader.php:176 jsLoader.php:338 +#: include/views/configuration.triggers.list.php:350 +#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148 +#: jsLoader.php:174 jsLoader.php:336 msgid "Delete" msgstr "Удалить" @@ -4870,7 +4878,7 @@ msgstr "Удалить и очистить выбранные шаблоны? ( msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)" msgstr "Удалить и очистить шаблон? (Внимание: все присоединенные к нему узлы сети будут очищены!)" -#: include/views/configuration.action.edit.php:492 +#: include/views/configuration.action.edit.php:495 msgid "Delete current action?" msgstr "Удалить текущее действие?" @@ -4878,7 +4886,7 @@ msgstr "Удалить текущее действие?" msgid "Delete current correlation?" msgstr "Удалить текущую корреляцию?" -#: jsLoader.php:339 +#: jsLoader.php:337 msgid "Delete dashboard?" msgstr "Удалить панель?" @@ -4902,11 +4910,11 @@ msgstr "Удалить прототип графиков?" msgid "Delete graph?" msgstr "Удалить график?" -#: include/views/configuration.item.list.php:294 +#: include/views/configuration.item.list.php:292 msgid "Delete history of selected items?" msgstr "Удалить историю выбранных элементов данных?" -#: include/views/configuration.httpconf.list.php:217 +#: include/views/configuration.httpconf.list.php:218 msgid "Delete history of selected web scenarios?" msgstr "Очистить историю выбранных веб-сценариев?" @@ -4922,7 +4930,7 @@ msgstr "Удалить прототип элементов данных?" msgid "Delete item?" msgstr "Удалить элемент данных?" -#: jsLoader.php:276 +#: jsLoader.php:274 msgid "Delete links between selected elements?" msgstr "Удалить связи между выбранными элементами?" @@ -4960,33 +4968,33 @@ msgstr "Удалить выбранный API токен?" msgid "Delete selected API tokens?" msgstr "Удалить выбранные API токены?" -#: include/views/configuration.action.list.php:161 +#: include/views/configuration.action.list.php:165 msgid "Delete selected actions?" msgstr "Удалить выбранные действия?" -#: app/views/configuration.correlation.list.php:148 +#: app/views/configuration.correlation.list.php:149 msgid "Delete selected correlations?" msgstr "Удалить выбранные корреляции?" #: app/views/configuration.dashboard.list.php:68 -#: app/views/monitoring.dashboard.list.php:123 +#: app/views/monitoring.dashboard.list.php:124 msgid "Delete selected dashboards?" msgstr "Удалить выбранные панели?" -#: app/views/configuration.discovery.list.php:121 -#: include/views/configuration.host.discovery.list.php:332 +#: app/views/configuration.discovery.list.php:122 +#: include/views/configuration.host.discovery.list.php:333 msgid "Delete selected discovery rules?" msgstr "Удалить выбранные правила обнаружения?" -#: jsLoader.php:263 +#: jsLoader.php:261 msgid "Delete selected elements?" msgstr "Удалить выбранные элементы?" -#: include/views/configuration.graph.list.php:240 +#: include/views/configuration.graph.list.php:241 msgid "Delete selected graph prototypes?" msgstr "Удалить выбранные прототипы графиков?" -#: include/views/configuration.graph.list.php:241 +#: include/views/configuration.graph.list.php:242 msgid "Delete selected graphs?" msgstr "Удалить выбранные графики?" @@ -4995,11 +5003,11 @@ msgstr "Удалить выбранные графики?" msgid "Delete selected group?" msgstr "Удалить выбранную группу?" -#: app/views/administration.usergroup.list.php:236 +#: app/views/administration.usergroup.list.php:237 msgid "Delete selected groups?" msgstr "Удалить выбранные группы?" -#: include/views/configuration.hostgroups.list.php:198 +#: include/views/configuration.hostgroups.list.php:199 msgid "Delete selected host groups?" msgstr "Удалить выбранные группы узлов сети?" @@ -5027,11 +5035,11 @@ msgstr "Удалить выбранное изображение?" msgid "Delete selected item prototypes?" msgstr "Удалить выбранные прототипы элементов данных?" -#: include/views/configuration.item.list.php:316 +#: include/views/configuration.item.list.php:314 msgid "Delete selected items?" msgstr "Удалить выбранные элементы данных?" -#: include/views/configuration.maintenance.list.php:123 +#: include/views/configuration.maintenance.list.php:124 msgid "Delete selected maintenance periods?" msgstr "Удалить выбранные периоды обслуживания?" @@ -5039,15 +5047,15 @@ msgstr "Удалить выбранные периоды обслуживани msgid "Delete selected map?" msgstr "Удалить выбранную карту сети?" -#: include/views/monitoring.sysmap.list.php:109 +#: include/views/monitoring.sysmap.list.php:110 msgid "Delete selected maps?" msgstr "Удалить выбранные карты сети?" -#: app/views/administration.mediatype.list.php:176 +#: app/views/administration.mediatype.list.php:177 msgid "Delete selected media types?" msgstr "Удалить выбранные способы оповещений?" -#: app/views/administration.proxy.list.php:177 +#: app/views/administration.proxy.list.php:178 msgid "Delete selected proxies?" msgstr "Удалить выбранные прокси?" @@ -5055,27 +5063,35 @@ msgstr "Удалить выбранные прокси?" msgid "Delete selected regular expressions?" msgstr "Удалить выбранные регулярные выражения?" -#: app/views/administration.userrole.edit.php:291 +#: app/views/administration.userrole.edit.php:281 msgid "Delete selected role?" msgstr "Удалить выбранную роль?" -#: app/views/administration.userrole.list.php:126 +#: app/views/administration.userrole.list.php:127 msgid "Delete selected roles?" msgstr "Удалить выбранные роли?" -#: app/partials/scheduledreport.formgrid.html.php:240 +#: app/partials/scheduledreport.formgrid.html.php:238 msgid "Delete selected scheduled report?" msgstr "Удалить выбранный регулярный отчет?" -#: app/views/reports.scheduledreport.list.php:96 +#: app/views/reports.scheduledreport.list.php:97 msgid "Delete selected scheduled reports?" msgstr "Удалить выбранные регулярные отчеты?" -#: app/views/administration.script.list.php:197 +#: app/views/administration.script.list.php:198 msgid "Delete selected scripts?" msgstr "Удалить выбранные скрипты?" -#: jsLoader.php:264 +#: app/views/js/monitoring.service.list.js.php:90 +msgid "Delete selected service?" +msgstr "" + +#: app/partials/monitoring.service.list.edit.php:143 +msgid "Delete selected services?" +msgstr "" + +#: jsLoader.php:262 msgid "Delete selected shapes?" msgstr "Удалить выбранные фигуры?" @@ -5087,7 +5103,7 @@ msgstr "Удалить выбранные шаблоны?" msgid "Delete selected trigger prototypes?" msgstr "Удалить выбранные прототипы триггеров?" -#: include/views/configuration.triggers.list.php:349 +#: include/views/configuration.triggers.list.php:350 msgid "Delete selected triggers?" msgstr "Удалить выбранные триггеры?" @@ -5095,19 +5111,14 @@ msgstr "Удалить выбранные триггеры?" msgid "Delete selected user?" msgstr "Удалить выбранного пользователя?" -#: app/views/administration.user.list.php:250 +#: app/views/administration.user.list.php:251 msgid "Delete selected users?" msgstr "Удалить выбранных пользователей?" -#: include/views/configuration.httpconf.list.php:223 +#: include/views/configuration.httpconf.list.php:224 msgid "Delete selected web scenarios?" msgstr "Удалить выбранные веб-сценарии?" -#: include/services.inc.php:120 -#, c-format -msgid "Delete service \"%1$s\"?" -msgstr "Удалить услугу \"%1$s\"?" - #: include/views/configuration.template.edit.php:239 msgid "Delete template?" msgstr "Удалить шаблон?" @@ -5129,7 +5140,7 @@ msgstr "Удалить веб-сценарий?" msgid "Deleted: Host \"%1$s\"." msgstr "Удалено: Узел сети \"%1$s\"." -#: include/classes/api/services/CHostPrototype.php:1165 +#: include/classes/api/services/CHostPrototype.php:1170 #, c-format msgid "Deleted: Host prototype \"%1$s\" on \"%2$s\"." msgstr "Удалено: Прототип узлов сети \"%1$s\" из \"%2$s\"." @@ -5153,12 +5164,11 @@ msgstr "Запрещенные методы" msgid "Deny" msgstr "Запрещено" -#: app/views/administration.userrole.edit.php:206 +#: app/views/administration.userrole.edit.php:199 msgid "Deny list" msgstr "Список запретов" #: app/views/popup.massupdate.trigger.php:154 -#: include/views/configuration.services.edit.php:357 #: include/views/configuration.trigger.prototype.edit.php:606 #: include/views/configuration.trigger.prototype.edit.php:640 #: include/views/configuration.triggers.edit.php:619 @@ -5175,9 +5185,8 @@ msgid "Dependent item" msgstr "Зависимый элемент данных" #: app/views/popup.generic.php:303 include/triggers.inc.php:2572 -#: include/views/configuration.services.edit.php:161 #: include/views/configuration.trigger.prototype.list.php:92 -#: include/views/configuration.triggers.list.php:237 +#: include/views/configuration.triggers.list.php:238 msgid "Depends on" msgstr "Зависит от" @@ -5187,11 +5196,11 @@ msgstr "Состояние развертывания" #: app/partials/hostmacros.list.html.php:37 #: app/partials/massupdate.macros.tab.php:29 -#: app/partials/scheduledreport.formgrid.html.php:197 +#: app/partials/scheduledreport.formgrid.html.php:195 #: app/views/administration.macros.edit.php:43 #: app/views/administration.mediatype.edit.php:265 #: app/views/administration.module.edit.php:41 -#: app/views/administration.module.list.php:76 +#: app/views/administration.module.list.php:77 #: app/views/administration.proxy.edit.php:89 #: app/views/administration.script.edit.php:203 #: app/views/administration.token.edit.php:70 @@ -5203,13 +5212,13 @@ msgstr "Состояние развертывания" #: app/views/popup.massupdate.item.php:466 #: app/views/popup.massupdate.template.php:75 #: app/views/popup.triggerwizard.php:137 -#: app/views/reports.auditlog.list.php:92 include/events.inc.php:261 +#: app/views/reports.auditlog.list.php:93 include/events.inc.php:264 #: include/views/configuration.host.discovery.edit.php:647 #: include/views/configuration.host.edit.php:184 #: include/views/configuration.item.edit.php:890 #: include/views/configuration.item.prototype.edit.php:768 #: include/views/configuration.maintenance.edit.php:252 -#: include/views/configuration.maintenance.list.php:89 +#: include/views/configuration.maintenance.list.php:90 #: include/views/configuration.template.edit.php:110 #: include/views/configuration.trigger.prototype.edit.php:531 #: include/views/configuration.triggers.edit.php:558 @@ -5217,12 +5226,12 @@ msgstr "Состояние развертывания" msgid "Description" msgstr "Описание" -#: app/views/administration.mediatype.list.php:81 -#: app/views/reports.auditlog.list.php:93 include/blocks.inc.php:530 -#: include/func.inc.php:1588 include/views/configuration.action.edit.php:174 -#: include/views/configuration.action.edit.php:178 -#: include/views/configuration.action.edit.php:321 -#: include/views/configuration.action.edit.php:407 +#: app/views/administration.mediatype.list.php:82 +#: app/views/reports.auditlog.list.php:94 include/blocks.inc.php:530 +#: include/func.inc.php:1588 include/views/configuration.action.edit.php:175 +#: include/views/configuration.action.edit.php:179 +#: include/views/configuration.action.edit.php:322 +#: include/views/configuration.action.edit.php:410 #: include/views/inventory.host.view.php:257 msgid "Details" msgstr "Детали" @@ -5231,7 +5240,7 @@ msgstr "Детали" msgid "Details of web scenario" msgstr "Подробности о веб-сценарии" -#: include/actions.inc.php:74 +#: include/actions.inc.php:76 msgid "Device" msgstr "Устройство" @@ -5258,32 +5267,32 @@ msgid "Directory size (in bytes). Returns integer" msgstr "Размер директории (в байтах). Возвращается целое число" #: app/controllers/CControllerAuditLogList.php:172 -#: app/views/administration.mediatype.list.php:167 -#: app/views/administration.module.list.php:123 +#: app/views/administration.mediatype.list.php:168 +#: app/views/administration.module.list.php:124 #: app/views/administration.token.list.php:201 -#: app/views/administration.usergroup.list.php:218 +#: app/views/administration.usergroup.list.php:219 #: app/views/administration.user.token.list.php:152 -#: app/views/configuration.correlation.list.php:147 -#: app/views/configuration.discovery.list.php:120 -#: app/views/reports.scheduledreport.list.php:90 -#: include/views/configuration.action.list.php:160 -#: include/views/configuration.host.discovery.list.php:324 +#: app/views/configuration.correlation.list.php:148 +#: app/views/configuration.discovery.list.php:121 +#: app/views/reports.scheduledreport.list.php:91 +#: include/views/configuration.action.list.php:164 +#: include/views/configuration.host.discovery.list.php:325 #: include/views/configuration.host.list.php:435 -#: include/views/configuration.httpconf.list.php:210 -#: include/views/configuration.item.list.php:288 -#: include/views/configuration.triggers.list.php:341 +#: include/views/configuration.httpconf.list.php:211 +#: include/views/configuration.item.list.php:286 +#: include/views/configuration.triggers.list.php:342 msgid "Disable" msgstr "Отключить" -#: app/views/administration.usergroup.list.php:230 +#: app/views/administration.usergroup.list.php:231 msgid "Disable debug mode" msgstr "Деактивировать режим отладки" -#: app/views/administration.usergroup.list.php:230 +#: app/views/administration.usergroup.list.php:231 msgid "Disable debug mode in selected groups?" msgstr "Деактивировать режим отладки у выбранных групп?" -#: include/actions.inc.php:666 include/actions.inc.php:985 +#: include/actions.inc.php:698 include/actions.inc.php:1032 msgid "Disable host" msgstr "Деактивировать узел сети" @@ -5291,16 +5300,16 @@ msgstr "Деактивировать узел сети" msgid "Disable host?" msgstr "Деактивировать узел сети?" -#: app/views/administration.proxy.list.php:174 -#: include/views/configuration.hostgroups.list.php:195 +#: app/views/administration.proxy.list.php:175 +#: include/views/configuration.hostgroups.list.php:196 msgid "Disable hosts" msgstr "Деактивировать узлы сети" -#: include/views/configuration.hostgroups.list.php:196 +#: include/views/configuration.hostgroups.list.php:197 msgid "Disable hosts in the selected host groups?" msgstr "Деактивировать узлы сети в выбранных группах узлов сети?" -#: app/views/administration.proxy.list.php:175 +#: app/views/administration.proxy.list.php:176 msgid "Disable hosts monitored by selected proxies?" msgstr "Деактивировать узлы сети наблюдаемые выбранными прокси?" @@ -5309,20 +5318,20 @@ msgstr "Деактивировать узлы сети наблюдаемые в msgid "Disable selected API tokens?" msgstr "Деактивировать выбранные API токены?" -#: include/views/configuration.action.list.php:160 +#: include/views/configuration.action.list.php:164 msgid "Disable selected actions?" msgstr "Деактивировать выбранные действия?" -#: app/views/configuration.correlation.list.php:147 +#: app/views/configuration.correlation.list.php:148 msgid "Disable selected correlations?" msgstr "Деактивировать выбранные корреляции?" -#: app/views/configuration.discovery.list.php:120 -#: include/views/configuration.host.discovery.list.php:324 +#: app/views/configuration.discovery.list.php:121 +#: include/views/configuration.host.discovery.list.php:325 msgid "Disable selected discovery rules?" msgstr "Деактивировать выбранные правила обнаружения?" -#: app/views/administration.usergroup.list.php:218 +#: app/views/administration.usergroup.list.php:219 msgid "Disable selected groups?" msgstr "Деактивировать выбранные группы?" @@ -5330,27 +5339,27 @@ msgstr "Деактивировать выбранные группы?" msgid "Disable selected hosts?" msgstr "Деактивировать выбранные узлы сети?" -#: include/views/configuration.item.list.php:288 +#: include/views/configuration.item.list.php:286 msgid "Disable selected items?" msgstr "Деактивировать выбранные элементы данных?" -#: app/views/administration.mediatype.list.php:167 +#: app/views/administration.mediatype.list.php:168 msgid "Disable selected media types?" msgstr "Деактивировать выбранные способы оповещения?" -#: app/views/administration.module.list.php:123 +#: app/views/administration.module.list.php:124 msgid "Disable selected modules?" msgstr "Деактивировать выбранные модули?" -#: app/views/reports.scheduledreport.list.php:91 +#: app/views/reports.scheduledreport.list.php:92 msgid "Disable selected scheduled reports?" msgstr "Деактивировать выбранные регулярные отчеты?" -#: include/views/configuration.triggers.list.php:341 +#: include/views/configuration.triggers.list.php:342 msgid "Disable selected triggers?" msgstr "Деактивировать выбранные триггеры?" -#: include/views/configuration.httpconf.list.php:210 +#: include/views/configuration.httpconf.list.php:211 msgid "Disable selected web scenarios?" msgstr "Деактивировать выбранные веб-сценарии?" @@ -5358,38 +5367,38 @@ msgstr "Деактивировать выбранные веб-сценарии? #: app/partials/monitoring.host.filter.php:129 #: app/partials/monitoring.host.view.html.php:102 #: app/partials/scheduledreport.table.html.php:80 -#: app/views/administration.mediatype.list.php:56 -#: app/views/administration.mediatype.list.php:134 +#: app/views/administration.mediatype.list.php:57 +#: app/views/administration.mediatype.list.php:135 #: app/views/administration.miscconfig.edit.php:60 -#: app/views/administration.module.list.php:53 -#: app/views/administration.module.list.php:100 +#: app/views/administration.module.list.php:54 +#: app/views/administration.module.list.php:101 #: app/views/administration.token.list.php:96 #: app/views/administration.token.list.php:184 #: app/views/administration.user.edit.php:264 #: app/views/administration.user.edit.php:457 -#: app/views/administration.usergroup.list.php:53 -#: app/views/administration.usergroup.list.php:91 -#: app/views/administration.usergroup.list.php:129 -#: app/views/administration.usergroup.list.php:143 -#: app/views/administration.user.list.php:203 -#: app/views/administration.user.list.php:237 -#: app/views/administration.user.list.php:239 +#: app/views/administration.usergroup.list.php:54 +#: app/views/administration.usergroup.list.php:92 +#: app/views/administration.usergroup.list.php:130 +#: app/views/administration.usergroup.list.php:144 +#: app/views/administration.user.list.php:204 +#: app/views/administration.user.list.php:238 +#: app/views/administration.user.list.php:240 #: app/views/administration.user.token.list.php:61 #: app/views/administration.user.token.list.php:135 -#: app/views/configuration.correlation.list.php:56 -#: app/views/configuration.correlation.list.php:107 -#: app/views/configuration.discovery.list.php:56 +#: app/views/configuration.correlation.list.php:57 +#: app/views/configuration.correlation.list.php:108 +#: app/views/configuration.discovery.list.php:57 #: app/views/popup.lldoperation.php:282 #: app/views/popup.massupdate.host.php:102 #: app/views/popup.massupdate.host.php:187 -#: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:108 +#: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108 #: include/hosts.inc.php:1205 include/html.inc.php:288 #: include/httptest.inc.php:48 include/items.inc.php:138 #: include/items.inc.php:141 include/items.inc.php:185 #: include/maps.inc.php:325 include/triggers.inc.php:2045 -#: include/users.inc.php:84 include/views/configuration.action.list.php:75 -#: include/views/configuration.action.list.php:125 -#: include/views/configuration.host.discovery.list.php:166 +#: include/users.inc.php:84 include/views/configuration.action.list.php:77 +#: include/views/configuration.action.list.php:129 +#: include/views/configuration.host.discovery.list.php:167 #: include/views/configuration.host.edit.php:381 #: include/views/configuration.host.list.php:229 #: include/views/configuration.host.prototype.edit.php:356 @@ -5416,7 +5425,7 @@ msgstr "Отбросить значение" #: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334 #: include/views/configuration.graph.edit.php:468 -#: include/views/configuration.graph.list.php:137 +#: include/views/configuration.graph.list.php:138 #: include/views/configuration.host.prototype.edit.php:143 #: include/views/configuration.host.prototype.list.php:62 #: include/views/configuration.item.prototype.edit.php:777 @@ -5443,13 +5452,13 @@ msgstr "Обнаружено" msgid "Discovered device" msgstr "Обнаруженное устройство" -#: app/views/popup.mediatype.message.php:58 app/views/search.php:146 +#: app/views/popup.mediatype.message.php:67 app/views/search.php:146 #: app/views/search.php:151 app/views/search.php:335 app/views/search.php:340 -#: include/classes/helpers/CMediatypeHelper.php:93 +#: include/classes/helpers/CMediatypeHelper.php:157 #: include/classes/helpers/CMenuHelper.php:71 -#: include/classes/helpers/CMenuHelper.php:207 +#: include/classes/helpers/CMenuHelper.php:212 #: include/classes/helpers/CRoleHelper.php:388 -#: include/classes/helpers/CRoleHelper.php:445 include/forms.inc.php:543 +#: include/classes/helpers/CRoleHelper.php:444 include/forms.inc.php:543 #: include/views/configuration.host.list.php:152 #: include/views/configuration.host.list.php:396 #: include/views/configuration.template.list.php:122 @@ -5459,8 +5468,8 @@ msgstr "Обнаруженное устройство" msgid "Discovery" msgstr "Обнаружение" -#: include/classes/helpers/CMenuHelper.php:184 -#: include/views/configuration.action.list.php:28 +#: include/classes/helpers/CMenuHelper.php:189 +#: include/views/configuration.action.list.php:29 msgid "Discovery actions" msgstr "Действия обнаружения" @@ -5469,7 +5478,7 @@ msgid "Discovery by proxy" msgstr "Обнаружение через прокси" #: app/controllers/CControllerPopupDiscoveryCheck.php:109 -#: app/views/popup.condition.common.php:415 include/actions.inc.php:53 +#: app/views/popup.condition.common.php:423 include/actions.inc.php:53 msgid "Discovery check" msgstr "Проверка обнаружения" @@ -5481,7 +5490,7 @@ msgstr "Проверки обнаружения" msgid "Discovery list" msgstr "Список обнаружений" -#: app/views/popup.condition.common.php:433 include/actions.inc.php:54 +#: app/views/popup.condition.common.php:441 include/actions.inc.php:54 msgid "Discovery object" msgstr "Объект обнаружения" @@ -5515,7 +5524,7 @@ msgstr "Обнаружение виртуальных машин VMware, <url> - #: app/controllers/CControllerAuditLogList.php:204 #: app/views/configuration.discovery.edit.php:137 -#: app/views/monitoring.discovery.view.php:49 +#: app/views/monitoring.discovery.view.php:50 #: app/views/monitoring.widget.discovery.view.php:32 #: include/actions.inc.php:52 include/forms.inc.php:889 msgid "Discovery rule" @@ -5583,7 +5592,7 @@ msgstr "Правило обнаружения обновлено" #: app/controllers/CControllerPopupImportCompare.php:168 #: app/views/configuration.discovery.edit.php:29 #: app/views/configuration.discovery.list.php:31 -#: app/views/popup.condition.common.php:463 app/views/popup.import.php:36 +#: app/views/popup.condition.common.php:471 app/views/popup.import.php:36 #: include/html.inc.php:386 #: include/views/configuration.host.discovery.edit.php:27 #: include/views/configuration.host.discovery.list.php:29 @@ -5594,7 +5603,7 @@ msgstr "Правила обнаружения" msgid "Discovery rules deleted" msgstr "Правила обнаружения удалены" -#: app/views/popup.condition.common.php:483 include/actions.inc.php:58 +#: app/views/popup.condition.common.php:491 include/actions.inc.php:58 #: include/classes/widgets/CWidgetConfig.php:48 msgid "Discovery status" msgstr "Состояние обнаружения" @@ -5632,9 +5641,9 @@ msgstr "Показать стэкируемый график" #: app/views/administration.queue.details.php:85 app/views/search.php:184 #: app/views/search.php:268 app/views/search.php:367 -#: include/actions.inc.php:1646 include/actions.inc.php:1717 -#: include/actions.inc.php:1807 include/classes/helpers/CPagerHelper.php:147 -#: jsLoader.php:378 +#: include/actions.inc.php:1701 include/actions.inc.php:1772 +#: include/actions.inc.php:1862 include/classes/helpers/CPagerHelper.php:147 +#: jsLoader.php:376 #, c-format msgid "Displaying %1$s of %2$s found" msgstr "Отображено %1$s из %2$s найденных" @@ -5652,7 +5661,7 @@ msgstr "Опции отображения" msgid "Division denominator" msgstr "Знаменатель деления" -#: include/services.inc.php:26 +#: include/classes/helpers/CServiceHelper.php:28 msgid "Do not calculate" msgstr "Без вычисления" @@ -5670,7 +5679,7 @@ msgstr "Не хранить историю" msgid "Do not keep trends" msgstr "Не хранить динамику изменений" -#: jsLoader.php:216 jsLoader.php:340 +#: jsLoader.php:214 jsLoader.php:338 msgid "Do you wish to replace the conditional expression?" msgstr "Вы хотите заменить условие выражения?" @@ -5726,7 +5735,7 @@ msgctxt "discovery status" msgid "Down" msgstr "Недоступен" -#: jsLoader.php:190 jsLoader.php:204 +#: jsLoader.php:188 jsLoader.php:202 msgid "Download image" msgstr "Загрузить изображение" @@ -5734,11 +5743,9 @@ msgstr "Загрузить изображение" msgid "Download the configuration file" msgstr "Загрузить конфигурационный файл" -#: app/views/report.services.php:80 app/views/report.services.php:81 -#: app/views/report.services.php:82 app/views/report.services.php:83 +#: app/partials/service.time.row.php:34 +#: app/views/popup.service.time.edit.php:46 #: include/classes/screens/CScreenDiscovery.php:120 -#: include/views/configuration.services.edit.php:193 -#: include/views/configuration.services.edit.php:245 msgid "Downtime" msgstr "Недоступен" @@ -5810,8 +5817,8 @@ msgstr "Дубликат usrgrpid \"%1$s\" в группах пользоват #: app/views/hint.box.php:76 app/views/monitoring.widget.problems.view.php:65 #: include/blocks.inc.php:721 include/classes/screens/CScreenProblem.php:875 #: include/classes/screens/CScreenProblem.php:900 -#: include/classes/screens/CScreenProblem.php:1168 include/events.inc.php:286 -#: include/views/configuration.action.edit.php:174 +#: include/classes/screens/CScreenProblem.php:1169 include/events.inc.php:289 +#: include/views/configuration.action.edit.php:175 msgid "Duration" msgstr "Длительность" @@ -5829,7 +5836,7 @@ msgstr "Динамический элемент" msgid "Dynamic items" msgstr "Динамические элементы данных" -#: jsLoader.php:275 +#: jsLoader.php:273 msgid "Each URL should have a unique name. Please make sure there is only one URL named" msgstr "У каждого URL должно быть уникальное имя. Пожалуйста, удостоверьтесь, что есть только один URL с этим именем" @@ -5837,13 +5844,17 @@ msgstr "У каждого URL должно быть уникальное имя. msgid "Each item" msgstr "Каждый элемент данных" +#: app/partials/monitoring.service.list.edit.php:127 +#: app/partials/service.time.row.php:59 #: app/views/administration.user.edit.php:312 #: app/views/js/administration.mediatype.edit.js.php:50 #: app/views/js/configuration.discovery.edit.js.php:33 -#: include/views/configuration.action.edit.php:248 -#: include/views/configuration.action.edit.php:276 -#: include/views/configuration.action.edit.php:358 -#: include/views/configuration.action.edit.php:434 +#: app/views/monitoring.service.list.edit.php:204 +#: app/views/monitoring.service.list.php:168 +#: include/views/configuration.action.edit.php:249 +#: include/views/configuration.action.edit.php:277 +#: include/views/configuration.action.edit.php:361 +#: include/views/configuration.action.edit.php:439 #: include/views/configuration.maintenance.edit.php:68 #: include/views/configuration.trigger.prototype.edit.php:111 #: include/views/configuration.trigger.prototype.edit.php:305 @@ -5851,8 +5862,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:177 -#: jsLoader.php:198 +#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175 +#: jsLoader.php:196 msgid "Edit" msgstr "Изменить" @@ -5868,11 +5879,11 @@ msgstr "Изменить карту сети" msgid "Edit operation" msgstr "Изменить операцию" -#: jsLoader.php:199 +#: jsLoader.php:197 msgid "Edit tree element" msgstr "Изменит элемент дерева" -#: jsLoader.php:341 +#: jsLoader.php:339 msgid "Edit trigger" msgstr "Изменить триггер" @@ -5936,7 +5947,7 @@ msgstr "Пустой цвет." msgid "Empty correlation ID." msgstr "Пустой ID корреляции." -#: include/classes/api/services/CAction.php:2627 +#: include/classes/api/services/CAction.php:2642 #, c-format msgid "Empty filter condition formula ID for action \"%1$s\"." msgstr "Пустой ID формулы условия фильтра для действия \"%1$s\"." @@ -5951,17 +5962,17 @@ msgstr "Пустой ID формулы условия фильтра для пр msgid "Empty filter condition macro for discovery rule \"%1$s\"." msgstr "Пустой макрос условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CAction.php:2632 +#: include/classes/api/services/CAction.php:2647 #, c-format msgid "Empty filter condition operator for action \"%1$s\"." msgstr "Пустой оператор условия фильтрации для действия \"%1$s\"." -#: include/classes/api/services/CAction.php:2616 +#: include/classes/api/services/CAction.php:2631 #, c-format msgid "Empty filter condition type for action \"%1$s\"." msgstr "Пустой тип условия фильтрации для действия \"%1$s\"." -#: include/classes/api/services/CAction.php:2690 +#: include/classes/api/services/CAction.php:2705 #: include/classes/api/services/CCorrelation.php:523 #: include/classes/api/services/CCorrelation.php:700 #: include/classes/api/services/CDRule.php:194 @@ -5972,7 +5983,7 @@ msgstr "Пустой тип условия фильтрации для дейс #: include/classes/api/services/CHost.php:792 #: include/classes/api/services/CHost.php:1369 #: include/classes/api/services/CHost.php:1898 -#: include/classes/api/services/CHostPrototype.php:1093 +#: include/classes/api/services/CHostPrototype.php:1098 #: include/classes/api/services/CImage.php:448 #: include/classes/api/services/CImage.php:501 #: include/classes/api/services/CMaintenance.php:542 @@ -5981,10 +5992,6 @@ msgstr "Пустой тип условия фильтрации для дейс #: 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/CService.php:360 -#: include/classes/api/services/CService.php:395 -#: include/classes/api/services/CService.php:459 -#: include/classes/api/services/CService.php:527 #: include/classes/api/services/CTemplate.php:682 #: include/classes/api/services/CTrigger.php:798 #: include/classes/api/services/CUserMacro.php:506 @@ -6001,29 +6008,25 @@ msgstr "Пустой ID карты сети." msgid "Empty media type ID." msgstr "Пустой ID типа оповещений." -#: include/classes/api/services/CService.php:881 -msgid "Empty name." -msgstr "Пустое имя." - #: include/classes/api/services/CImage.php:360 msgid "Empty parameters" msgstr "Пустые параметры" #: app/controllers/CControllerAuditLogList.php:171 -#: app/views/administration.mediatype.list.php:166 -#: app/views/administration.module.list.php:122 +#: app/views/administration.mediatype.list.php:167 +#: app/views/administration.module.list.php:123 #: app/views/administration.token.list.php:200 -#: app/views/administration.usergroup.list.php:212 +#: app/views/administration.usergroup.list.php:213 #: app/views/administration.user.token.list.php:151 -#: app/views/configuration.correlation.list.php:146 -#: app/views/configuration.discovery.list.php:119 -#: app/views/reports.scheduledreport.list.php:85 -#: include/views/configuration.action.list.php:159 -#: include/views/configuration.host.discovery.list.php:323 +#: app/views/configuration.correlation.list.php:147 +#: app/views/configuration.discovery.list.php:120 +#: app/views/reports.scheduledreport.list.php:86 +#: include/views/configuration.action.list.php:163 +#: include/views/configuration.host.discovery.list.php:324 #: include/views/configuration.host.list.php:434 -#: include/views/configuration.httpconf.list.php:209 -#: include/views/configuration.item.list.php:287 -#: include/views/configuration.triggers.list.php:340 +#: include/views/configuration.httpconf.list.php:210 +#: include/views/configuration.item.list.php:285 +#: include/views/configuration.triggers.list.php:341 msgid "Enable" msgstr "Активировать" @@ -6039,7 +6042,7 @@ msgstr "Активация LDAP аутентификации" msgid "Enable SAML authentication" msgstr "Включить SAML аутентификацию" -#: app/views/administration.housekeeping.edit.php:164 +#: app/views/administration.housekeeping.edit.php:173 msgid "Enable compression" msgstr "Включить сжатие" @@ -6047,15 +6050,15 @@ msgstr "Включить сжатие" msgid "Enable confirmation" msgstr "Включить подтверждение" -#: app/views/administration.usergroup.list.php:224 +#: app/views/administration.usergroup.list.php:225 msgid "Enable debug mode" msgstr "Активировать режим отладки" -#: app/views/administration.usergroup.list.php:224 +#: app/views/administration.usergroup.list.php:225 msgid "Enable debug mode in selected groups?" msgstr "Активировать режим отладки для выбранных групп?" -#: include/actions.inc.php:662 include/actions.inc.php:984 +#: include/actions.inc.php:694 include/actions.inc.php:1031 msgid "Enable host" msgstr "Активировать узел сети" @@ -6063,21 +6066,21 @@ msgstr "Активировать узел сети" msgid "Enable host?" msgstr "Активировать узел сети?" -#: app/views/administration.proxy.list.php:171 -#: include/views/configuration.hostgroups.list.php:194 +#: app/views/administration.proxy.list.php:172 +#: include/views/configuration.hostgroups.list.php:195 msgid "Enable hosts" msgstr "Активировать узлы сети" -#: app/views/administration.proxy.list.php:172 +#: app/views/administration.proxy.list.php:173 msgid "Enable hosts monitored by selected proxies?" msgstr "Активировать узлы сети наблюдаемые выбранными прокси?" #: app/views/administration.housekeeping.edit.php:43 -#: app/views/administration.housekeeping.edit.php:88 -#: app/views/administration.housekeeping.edit.php:101 -#: app/views/administration.housekeeping.edit.php:114 -#: app/views/administration.housekeeping.edit.php:127 -#: app/views/administration.housekeeping.edit.php:144 +#: app/views/administration.housekeeping.edit.php:97 +#: app/views/administration.housekeeping.edit.php:110 +#: app/views/administration.housekeeping.edit.php:123 +#: app/views/administration.housekeeping.edit.php:136 +#: app/views/administration.housekeeping.edit.php:153 msgid "Enable internal housekeeping" msgstr "Активировать внутреннюю очистку истории" @@ -6086,49 +6089,49 @@ msgstr "Активировать внутреннюю очистку истор msgid "Enable selected API tokens?" msgstr "Активировать выбранные API токены?" -#: include/views/configuration.action.list.php:159 +#: include/views/configuration.action.list.php:163 msgid "Enable selected actions?" msgstr "Активировать выбранные действия?" -#: app/views/configuration.correlation.list.php:146 +#: app/views/configuration.correlation.list.php:147 msgid "Enable selected correlations?" msgstr "Активировать выбранные корреляции?" -#: app/views/configuration.discovery.list.php:119 -#: include/views/configuration.host.discovery.list.php:323 +#: app/views/configuration.discovery.list.php:120 +#: include/views/configuration.host.discovery.list.php:324 msgid "Enable selected discovery rules?" msgstr "Активировать выбранные правила обнаружения?" -#: app/views/administration.usergroup.list.php:212 +#: app/views/administration.usergroup.list.php:213 msgid "Enable selected groups?" msgstr "Активировать выбранные группы?" -#: include/views/configuration.hostgroups.list.php:194 +#: include/views/configuration.hostgroups.list.php:195 #: include/views/configuration.host.list.php:434 msgid "Enable selected hosts?" msgstr "Активировать выбранные узлы сети?" -#: include/views/configuration.item.list.php:287 +#: include/views/configuration.item.list.php:285 msgid "Enable selected items?" msgstr "Активировать выбранные элементы данных?" -#: app/views/administration.mediatype.list.php:166 +#: app/views/administration.mediatype.list.php:167 msgid "Enable selected media types?" msgstr "Активировать выбранные способы оповещения?" -#: app/views/administration.module.list.php:122 +#: app/views/administration.module.list.php:123 msgid "Enable selected modules?" msgstr "Активировать выбранные модули?" -#: app/views/reports.scheduledreport.list.php:86 +#: app/views/reports.scheduledreport.list.php:87 msgid "Enable selected scheduled reports?" msgstr "Активировать выбранные регулярные отчеты?" -#: include/views/configuration.triggers.list.php:340 +#: include/views/configuration.triggers.list.php:341 msgid "Enable selected triggers?" msgstr "Активировать выбранные триггеры?" -#: include/views/configuration.httpconf.list.php:209 +#: include/views/configuration.httpconf.list.php:210 msgid "Enable selected web scenarios?" msgstr "Активировать выбранные веб-сценарии?" @@ -6142,14 +6145,14 @@ msgstr "Активировать трапы" #: app/partials/configuration.filter.items.php:187 #: app/partials/monitoring.host.filter.php:128 #: app/partials/monitoring.host.view.html.php:101 -#: app/partials/scheduledreport.formgrid.html.php:207 +#: app/partials/scheduledreport.formgrid.html.php:205 #: app/partials/scheduledreport.table.html.php:84 #: app/views/administration.mediatype.edit.php:268 -#: app/views/administration.mediatype.list.php:55 -#: app/views/administration.mediatype.list.php:130 +#: app/views/administration.mediatype.list.php:56 +#: app/views/administration.mediatype.list.php:131 #: app/views/administration.module.edit.php:45 -#: app/views/administration.module.list.php:52 -#: app/views/administration.module.list.php:94 +#: app/views/administration.module.list.php:53 +#: app/views/administration.module.list.php:95 #: app/views/administration.token.edit.php:89 #: app/views/administration.token.list.php:95 #: app/views/administration.token.list.php:175 @@ -6159,35 +6162,35 @@ msgstr "Активировать трапы" #: app/views/administration.usergroup.edit.php:80 #: app/views/administration.usergroup.edit.php:92 #: app/views/administration.usergroup.edit.php:93 -#: app/views/administration.usergroup.list.php:52 -#: app/views/administration.usergroup.list.php:82 -#: app/views/administration.usergroup.list.php:120 -#: app/views/administration.usergroup.list.php:142 -#: app/views/administration.user.list.php:206 -#: app/views/administration.user.list.php:236 -#: app/views/administration.user.list.php:240 -#: app/views/administration.userrole.edit.php:190 +#: app/views/administration.usergroup.list.php:53 +#: app/views/administration.usergroup.list.php:83 +#: app/views/administration.usergroup.list.php:121 +#: app/views/administration.usergroup.list.php:143 +#: app/views/administration.user.list.php:207 +#: app/views/administration.user.list.php:237 +#: app/views/administration.user.list.php:241 +#: app/views/administration.userrole.edit.php:183 #: app/views/administration.user.token.edit.php:70 #: app/views/administration.user.token.list.php:60 #: app/views/administration.user.token.list.php:126 #: app/views/administration.user.token.view.php:55 #: app/views/configuration.correlation.edit.php:157 -#: app/views/configuration.correlation.list.php:55 -#: app/views/configuration.correlation.list.php:118 +#: app/views/configuration.correlation.list.php:56 +#: app/views/configuration.correlation.list.php:119 #: app/views/configuration.discovery.edit.php:131 -#: app/views/configuration.discovery.list.php:55 +#: app/views/configuration.discovery.list.php:56 #: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89 #: app/views/popup.triggerwizard.php:140 -#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:107 +#: app/views/reports.scheduledreport.list.php:63 include/discovery.inc.php:107 #: include/html.inc.php:284 include/httptest.inc.php:47 #: include/items.inc.php:138 include/items.inc.php:141 #: include/items.inc.php:182 include/triggers.inc.php:1176 #: include/triggers.inc.php:2042 #: include/views/configuration.action.edit.php:147 -#: include/views/configuration.action.list.php:74 -#: include/views/configuration.action.list.php:133 +#: include/views/configuration.action.list.php:76 +#: include/views/configuration.action.list.php:137 #: include/views/configuration.host.discovery.edit.php:650 -#: include/views/configuration.host.discovery.list.php:165 +#: include/views/configuration.host.discovery.list.php:166 #: include/views/configuration.host.edit.php:199 #: include/views/configuration.host.list.php:221 #: include/views/configuration.httpconf.edit.php:148 @@ -6201,7 +6204,7 @@ msgid "Encrypt" msgstr "Шифрование" #: app/views/administration.proxy.edit.php:148 -#: app/views/administration.proxy.list.php:74 +#: app/views/administration.proxy.list.php:75 #: app/views/popup.massupdate.host.php:302 #: include/views/configuration.host.edit.php:514 #: include/views/configuration.host.prototype.edit.php:409 @@ -6212,11 +6215,11 @@ msgstr "Шифрование" msgid "Encryption level" msgstr "Уровень шифрования" -#: app/partials/scheduledreport.formgrid.html.php:165 +#: app/partials/scheduledreport.formgrid.html.php:164 msgid "End date" msgstr "Дата окончания" -#: app/views/popup.itemtestedit.view.php:295 +#: app/views/popup.itemtestedit.view.php:297 msgid "End of line sequence" msgstr "Конец строки" @@ -6245,6 +6248,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:102 #: include/classes/helpers/CTagFilterFieldHelper.php:68 #: include/classes/helpers/CTagFilterFieldHelper.php:123 #: include/classes/widgets/CWidgetHelper.php:478 @@ -6268,7 +6272,7 @@ msgstr "Ошибка" msgid "Error in search request for table \"%1$s\"." msgstr "Ошибка в запросе поиска в таблицу \"%1$s\"." -#: include/func.inc.php:1631 jsLoader.php:218 +#: include/func.inc.php:1631 jsLoader.php:216 msgid "Error message" msgstr "Сообщение об ошибке" @@ -6278,7 +6282,7 @@ msgstr "Сообщение об ошибке" msgid "Error: %1$s" msgstr "Ошибка: %1$s" -#: include/events.inc.php:177 +#: include/events.inc.php:180 msgid "Event" msgstr "Событие" @@ -6292,7 +6296,7 @@ msgstr "Событие подтверждено" #: app/controllers/CControllerAuditLogList.php:212 #: app/views/configuration.correlation.list.php:31 -#: include/classes/helpers/CMenuHelper.php:202 +#: include/classes/helpers/CMenuHelper.php:207 #: include/classes/helpers/CRoleHelper.php:440 msgid "Event correlation" msgstr "Корреляция событий" @@ -6311,11 +6315,11 @@ msgstr "Детали события" msgid "Event generation" msgstr "Генерация события" -#: include/actions.inc.php:340 +#: include/actions.inc.php:363 msgid "Event is acknowledged" msgstr "Событие подтверждено" -#: include/actions.inc.php:340 +#: include/actions.inc.php:363 msgid "Event is not acknowledged" msgstr "Событие не подтверждено" @@ -6337,7 +6341,7 @@ msgstr "Имя события" msgid "Event tag pair" msgstr "Пара тегов событий" -#: app/views/popup.condition.common.php:607 include/actions.inc.php:63 +#: app/views/popup.condition.common.php:617 include/actions.inc.php:63 msgid "Event type" msgstr "Тип события" @@ -6371,7 +6375,7 @@ msgstr "Исключая выбранные" #: app/partials/js/scheduledreport.subscription.js.php:170 #: app/partials/js/scheduledreport.subscription.js.php:185 -#: app/views/popup.scheduledreport.subscription.php:120 +#: app/views/popup.scheduledreport.subscription.php:119 #: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:112 msgid "Exclude" msgstr "Исключить" @@ -6383,7 +6387,7 @@ msgstr "Исключить" msgid "Exclude host groups" msgstr "Исключить группы узлов сети" -#: app/controllers/CControllerAuditLogList.php:173 jsLoader.php:209 +#: app/controllers/CControllerAuditLogList.php:173 jsLoader.php:207 msgid "Execute" msgstr "Выполнить" @@ -6402,23 +6406,23 @@ msgid "Execute WMI query and return the first selected object. Returns integer, msgstr "Выполнение запроса WMI и получение первого выбранного объекта. Возвращает целое число, число с плавающей точкой или текст (в зависимости от запроса)" #: include/views/configuration.host.discovery.edit.php:895 -#: include/views/configuration.host.discovery.list.php:328 +#: include/views/configuration.host.discovery.list.php:329 #: include/views/configuration.item.edit.php:930 -#: include/views/configuration.item.list.php:303 +#: include/views/configuration.item.list.php:301 msgid "Execute now" msgstr "Выполнить сейчас" #: app/views/administration.script.edit.php:122 -#: app/views/administration.script.list.php:77 +#: app/views/administration.script.list.php:78 msgid "Execute on" msgstr "Выполнение на" -#: include/classes/helpers/CRoleHelper.php:499 +#: include/classes/helpers/CRoleHelper.php:496 msgid "Execute scripts" msgstr "Выполнение скриптов" -#: include/actions.inc.php:2045 -#: include/views/administration.auditacts.list.php:77 +#: include/actions.inc.php:2100 +#: include/views/administration.auditacts.list.php:78 msgid "Executed" msgstr "Выполнено" @@ -6429,7 +6433,7 @@ msgstr "Выполнено" msgid "Executed script" msgstr "Выполняемый скрипт" -#: jsLoader.php:210 +#: jsLoader.php:208 msgid "Execution confirmation" msgstr "Подтверждение выполнения" @@ -6445,8 +6449,8 @@ msgid "Exists" msgstr "Существует" #: include/classes/html/CCollapsibleUiWidget.php:60 -#: include/classes/widgets/CWidgetHelper.php:970 jsLoader.php:299 -#: jsLoader.php:302 +#: include/classes/widgets/CWidgetHelper.php:970 jsLoader.php:297 +#: jsLoader.php:300 msgid "Expand" msgstr "Раскрыть" @@ -6464,12 +6468,12 @@ msgid "Expand single problem" msgstr "Развертывание одиночной проблемы" #: app/partials/scheduledreport.table.html.php:92 -#: app/views/reports.scheduledreport.list.php:64 +#: app/views/reports.scheduledreport.list.php:65 msgid "Expired" msgstr "Истек" -#: include/views/configuration.maintenance.list.php:67 -#: include/views/configuration.maintenance.list.php:97 +#: include/views/configuration.maintenance.list.php:68 +#: include/views/configuration.maintenance.list.php:98 msgctxt "maintenance status" msgid "Expired" msgstr "Завершено" @@ -6524,7 +6528,7 @@ msgstr "Экспорт в CSV" #: include/views/configuration.triggers.edit.php:220 #: include/views/configuration.triggers.edit.php:322 #: include/views/configuration.triggers.edit.php:417 -#: include/views/configuration.triggers.list.php:193 +#: include/views/configuration.triggers.list.php:194 #: include/views/js/configuration.triggers.edit.js.php:53 #: trigger_prototypes.php:41 trigger_prototypes.php:53 triggers.php:48 #: triggers.php:59 @@ -6567,7 +6571,7 @@ msgstr "Выражения" msgid "External check" msgstr "Внешняя проверка" -#: jsLoader.php:246 +#: jsLoader.php:244 msgctxt "Friday short" msgid "F" msgstr "Пт" @@ -6585,8 +6589,8 @@ msgstr "FTP" msgid "Fail" msgstr "Ошибка" -#: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:2057 -#: include/views/administration.auditacts.list.php:87 +#: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:2112 +#: include/views/administration.auditacts.list.php:88 msgid "Failed" msgstr "Неудачно" @@ -6600,11 +6604,11 @@ msgstr "Ошибка при создании панели" msgid "Failed to parse URL." msgstr "Ошибка при разборе URL." -#: jsLoader.php:151 +#: jsLoader.php:149 msgid "Failed to paste dashboard page." msgstr "Ошибка при вставке страницы панели." -#: jsLoader.php:152 +#: jsLoader.php:150 msgid "Failed to paste widget." msgstr "Ошибка при вставке виджета." @@ -6613,11 +6617,11 @@ msgstr "Ошибка при вставке виджета." msgid "Failed to update dashboard" msgstr "Ошибка при обновлении панели" -#: jsLoader.php:153 +#: jsLoader.php:151 msgid "Failed to update dashboard page properties." msgstr "Ошибка при обновлении свойств страницы панели." -#: jsLoader.php:154 +#: jsLoader.php:152 msgid "Failed to update dashboard properties." msgstr "Ошибка при обновлении свойств панели." @@ -6625,7 +6629,7 @@ msgstr "Ошибка при обновлении свойств панели." msgid "Failed to update template." msgstr "Ошибка при обновлении шаблона." -#: jsLoader.php:155 +#: jsLoader.php:153 msgid "Failed to update widget properties." msgstr "Ошибка при обновлении свойств виджета." @@ -6649,11 +6653,11 @@ msgstr "Избранные карты сетей" msgid "Feb" msgstr "Фев." -#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:224 +#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222 msgid "February" msgstr "Февраль" -#: hostinventoriesoverview.php:86 include/views/inventory.host.list.php:62 +#: hostinventoriesoverview.php:86 include/views/inventory.host.list.php:63 msgid "Field" msgstr "Поле" @@ -6666,7 +6670,7 @@ msgstr "Поле \"%1$s\" не может быть NULL." #: app/controllers/CControllerDashboardPropertiesEdit.php:40 #: app/controllers/CControllerPopupTriggerWizard.php:230 #: app/controllers/CControllerUserUpdateGeneral.php:126 -#: include/classes/api/services/CAction.php:1665 +#: include/classes/api/services/CAction.php:1681 #: include/classes/api/services/CDRule.php:203 #: include/classes/api/services/CDRule.php:325 #: include/classes/api/services/CDRule.php:528 @@ -6772,42 +6776,44 @@ msgstr "Заполнение" msgid "Filled region" msgstr "Заполнение" -#: app/partials/common.filter.item.php:83 -#: app/partials/common.filter.trigger.php:170 +#: app/partials/common.filter.item.php:84 +#: app/partials/common.filter.trigger.php:171 #: app/partials/configuration.filter.items.php:230 -#: app/views/administration.mediatype.list.php:46 -#: app/views/administration.module.list.php:43 -#: app/views/administration.proxy.list.php:41 -#: app/views/administration.script.list.php:41 +#: app/views/administration.mediatype.list.php:47 +#: app/views/administration.module.list.php:44 +#: app/views/administration.proxy.list.php:42 +#: app/views/administration.script.list.php:42 #: app/views/administration.token.list.php:38 -#: app/views/administration.usergroup.list.php:43 -#: app/views/administration.user.list.php:61 -#: app/views/administration.userrole.list.php:43 +#: app/views/administration.usergroup.list.php:44 +#: app/views/administration.user.list.php:62 +#: app/views/administration.userrole.list.php:44 #: app/views/administration.user.token.list.php:37 -#: app/views/configuration.correlation.list.php:46 -#: app/views/configuration.discovery.list.php:46 -#: app/views/monitoring.charts.view.php:83 -#: app/views/monitoring.dashboard.list.php:58 -#: app/views/monitoring.discovery.view.php:46 -#: app/views/monitoring.latest.view.php:53 -#: app/views/monitoring.web.view.php:48 app/views/reports.auditlog.list.php:81 -#: app/views/reports.scheduledreport.list.php:47 -#: hostinventoriesoverview.php:156 include/classes/html/CFilter.php:394 +#: app/views/configuration.correlation.list.php:47 +#: app/views/configuration.discovery.list.php:47 +#: app/views/monitoring.charts.view.php:84 +#: app/views/monitoring.dashboard.list.php:59 +#: app/views/monitoring.discovery.view.php:47 +#: app/views/monitoring.latest.view.php:54 +#: app/views/monitoring.service.list.edit.php:131 +#: app/views/monitoring.service.list.php:122 +#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:82 +#: app/views/reports.scheduledreport.list.php:48 +#: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394 #: include/classes/widgets/forms/CWidgetFormMap.php:56 -#: include/views/administration.auditacts.list.php:53 -#: include/views/configuration.action.list.php:65 -#: include/views/configuration.graph.list.php:74 -#: include/views/configuration.host.discovery.list.php:170 -#: include/views/configuration.hostgroups.list.php:42 +#: include/views/administration.auditacts.list.php:54 +#: include/views/configuration.action.list.php:67 +#: include/views/configuration.graph.list.php:75 +#: include/views/configuration.host.discovery.list.php:171 +#: include/views/configuration.hostgroups.list.php:43 #: include/views/configuration.host.list.php:59 -#: include/views/configuration.httpconf.list.php:88 -#: include/views/configuration.maintenance.list.php:40 +#: include/views/configuration.httpconf.list.php:89 +#: include/views/configuration.maintenance.list.php:41 #: include/views/configuration.template.list.php:42 -#: include/views/configuration.triggers.list.php:142 -#: include/views/inventory.host.list.php:42 +#: include/views/configuration.triggers.list.php:143 +#: include/views/inventory.host.list.php:43 #: include/views/monitoring.history.php:269 -#: include/views/monitoring.sysmap.list.php:45 -#: include/views/reports.toptriggers.php:80 report2.php:500 +#: include/views/monitoring.sysmap.list.php:46 +#: include/views/reports.toptriggers.php:80 report2.php:501 msgid "Filter" msgstr "Фильтр" @@ -6815,6 +6821,10 @@ msgstr "Фильтр" msgid "Filter properties" msgstr "Свойства фильтра" +#: app/controllers/CControllerServiceListGeneral.php:171 +msgid "Filter results" +msgstr "" + #: app/views/popup.lldoverride.php:183 #: include/views/configuration.host.discovery.edit.php:765 #: include/views/configuration.host.discovery.edit.php:883 @@ -6905,7 +6915,7 @@ msgstr "Данные формы" msgid "Formula" msgstr "Формула" -#: include/classes/api/services/CAction.php:2593 +#: include/classes/api/services/CAction.php:2608 #, c-format msgid "Formula missing for action \"%1$s\"." msgstr "Отсутствует формула у \"%1$s\" действия." @@ -6928,19 +6938,17 @@ msgstr "Французский (fr_FR)" msgid "Fri" msgstr "Пт" -#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:239 +#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237 msgid "Friday" msgstr "Пятница" #: app/partials/massupdate.valuemaps.tab.php:45 #: app/partials/timeselector.filter.php:88 -#: app/views/popup.tabfilter.edit.php:44 app/views/report.services.php:82 -#: include/classes/html/CFilter.php:282 +#: app/views/popup.service.time.edit.php:61 +#: app/views/popup.service.time.edit.php:124 +#: app/views/popup.tabfilter.edit.php:44 include/classes/html/CFilter.php:282 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:86 -#: include/views/configuration.services.edit.php:259 -#: include/views/configuration.services.edit.php:307 #: include/views/js/monitoring.sysmaps.js.php:748 report4.php:191 -#: services.php:47 services.php:177 msgid "From" msgstr "От" @@ -6950,8 +6958,8 @@ msgstr "URL веб-интерфейса" #: app/views/administration.usergroup.edit.php:79 #: app/views/administration.usergroup.edit.php:87 -#: app/views/administration.usergroup.list.php:75 -#: app/views/administration.user.list.php:113 +#: app/views/administration.usergroup.list.php:76 +#: app/views/administration.user.list.php:114 msgid "Frontend access" msgstr "Доступ к веб-интерфейсу" @@ -6976,13 +6984,13 @@ msgid "Function" msgstr "Функция" #: app/views/administration.mediatype.edit.php:128 -#: app/views/administration.mediatype.list.php:99 +#: app/views/administration.mediatype.list.php:100 msgid "GSM modem" msgstr "GSM модем" #: app/views/administration.gui.edit.php:30 #: app/views/administration.gui.edit.php:143 -#: include/classes/helpers/CMenuHelper.php:230 include/html.inc.php:878 +#: include/classes/helpers/CMenuHelper.php:232 include/html.inc.php:878 msgid "GUI" msgstr "Веб-интерфейс" @@ -6995,17 +7003,17 @@ msgstr "Доступ к веб-интерфейсу деактивирован." msgid "GUI settings" msgstr "Настройки веб-интерфейса" -#: include/classes/helpers/CMenuHelper.php:228 -#: include/classes/helpers/CRoleHelper.php:456 +#: include/classes/helpers/CMenuHelper.php:230 +#: include/classes/helpers/CRoleHelper.php:453 msgid "General" msgstr "Общие" #: app/partials/scheduledreport.subscription.php:34 -#: app/views/popup.scheduledreport.subscription.php:102 +#: app/views/popup.scheduledreport.subscription.php:101 msgid "Generate report by" msgstr "Генерировать отчет от" -#: chart4.php:172 chart5.php:203 +#: chart4.php:172 #, c-format msgid "Generated in %1$s sec" msgstr "Сгенерировано за %1$s сек" @@ -7023,16 +7031,16 @@ msgstr "Немецкий (de_DE)" msgid "Get content of web page. Returns web page source as text" msgstr "Получение содержимого веб страницы. Возвращает исходный код веб страницы в виде текста" -#: app/views/popup.itemtestedit.view.php:250 +#: app/views/popup.itemtestedit.view.php:252 msgid "Get value" msgstr "Получить значение" #: app/views/js/popup.itemtestedit.view.js.php:505 -#: app/views/popup.itemtestedit.view.php:434 +#: app/views/popup.itemtestedit.view.php:436 msgid "Get value and test" msgstr "Получить значение и протестировать" -#: app/views/popup.itemtestedit.view.php:93 +#: app/views/popup.itemtestedit.view.php:95 msgid "Get value from host" msgstr "Получить значение с узла сети" @@ -7055,7 +7063,7 @@ msgstr "Глобальное значение" msgid "Go back to %1$s" msgstr "Вернуться к %1$s" -#: jsLoader.php:346 +#: jsLoader.php:344 msgid "Go to" msgstr "Перейти к" @@ -7105,13 +7113,13 @@ msgstr "Градиентная линия" #: app/partials/monitoring.latest.view.html.php:154 #: app/views/monitoring.charts.view.php:56 #: include/classes/macros/CMacrosResolverGeneral.php:905 -#: include/classes/screens/CScreenProblem.php:1312 -#: include/classes/screens/CScreenProblem.php:1317 +#: include/classes/screens/CScreenProblem.php:1313 +#: include/classes/screens/CScreenProblem.php:1318 #: include/classes/widgets/CWidgetConfig.php:60 #: include/classes/widgets/forms/CWidgetFormGraph.php:32 #: include/classes/widgets/forms/CWidgetFormGraph.php:66 #: include/views/configuration.graph.edit.php:478 -#: include/views/monitoring.history.php:77 report2.php:506 +#: include/views/monitoring.history.php:77 report2.php:507 msgid "Graph" msgstr "График" @@ -7229,7 +7237,7 @@ msgstr "Прототип графиков с ID \"%1$s\" недоступен." #: app/controllers/CControllerPopupImportCompare.php:174 #: include/html.inc.php:468 include/views/configuration.graph.edit.php:35 #: include/views/configuration.graph.list.php:28 -#: include/views/configuration.host.discovery.list.php:297 +#: include/views/configuration.host.discovery.list.php:298 msgid "Graph prototypes" msgstr "Прототипы графиков" @@ -7245,7 +7253,7 @@ msgstr "Суммарный график" #: app/controllers/CControllerPopupGeneric.php:271 #: app/controllers/CControllerPopupGeneric.php:284 #: include/views/configuration.graph.edit.php:106 -#: include/views/configuration.graph.list.php:152 +#: include/views/configuration.graph.list.php:153 #: include/views/monitoring.history.php:254 msgid "Graph type" msgstr "Тип графика" @@ -7278,14 +7286,14 @@ msgstr "График с таким же именем, но другого тип #: app/partials/monitoring.host.view.html.php:127 #: app/partials/monitoring.host.view.html.php:135 #: app/views/monitoring.charts.view.php:39 -#: app/views/monitoring.charts.view.php:110 -#: app/views/monitoring.charts.view.php:138 app/views/popup.import.php:38 +#: app/views/monitoring.charts.view.php:111 +#: app/views/monitoring.charts.view.php:139 app/views/popup.import.php:38 #: app/views/search.php:89 app/views/search.php:96 app/views/search.php:137 #: app/views/search.php:142 app/views/search.php:316 app/views/search.php:321 #: graphs.php:485 include/html.inc.php:356 #: include/views/configuration.graph.edit.php:30 #: include/views/configuration.graph.list.php:44 -#: include/views/configuration.host.discovery.list.php:195 +#: include/views/configuration.host.discovery.list.php:196 #: include/views/configuration.host.list.php:151 #: include/views/configuration.host.list.php:387 #: include/views/configuration.template.list.php:120 @@ -7293,7 +7301,7 @@ msgstr "График с таким же именем, но другого тип #: 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:347 +#: include/views/inventory.host.view.php:217 jsLoader.php:345 msgid "Graphs" msgstr "Графики" @@ -7310,7 +7318,7 @@ msgstr "Греческий (el_GR)" msgid "Grid" msgstr "Сетка" -#: include/views/inventory.host.list.php:84 +#: include/views/inventory.host.list.php:85 msgid "Group" msgstr "Группа" @@ -7354,7 +7362,7 @@ msgstr "Группа для обнаруженных узлов сети" msgid "Group name" msgstr "Имя группы" -#: include/classes/api/services/CHostPrototype.php:1255 +#: include/classes/api/services/CHostPrototype.php:1260 #, c-format msgid "Group prototype cannot be based on a discovered host group \"%1$s\"." msgstr "Прототип группы не может основываться на обнаруженной группе узлов сети \"%1$s\"." @@ -7367,13 +7375,13 @@ msgstr "Прототипы групп" msgid "Group updated" msgstr "Прототипы групп" -#: hostinventoriesoverview.php:176 +#: hostinventoriesoverview.php:177 msgid "Grouping by" msgstr "Сгруппировать по" #: app/controllers/CControllerPopupImportCompare.php:163 #: app/views/administration.user.edit.php:86 -#: app/views/administration.user.list.php:110 app/views/popup.import.php:29 +#: app/views/administration.user.list.php:111 app/views/popup.import.php:29 #: include/views/configuration.host.edit.php:86 #: include/views/configuration.host.prototype.edit.php:164 #: include/views/configuration.host.prototype.edit.php:200 @@ -7381,7 +7389,7 @@ msgstr "Сгруппировать по" msgid "Groups" msgstr "Группы" -#: include/classes/helpers/CMenuHelper.php:362 +#: include/classes/helpers/CMenuHelper.php:364 msgid "Guest user" msgstr "Гостевой пользователь" @@ -7419,7 +7427,7 @@ msgstr "HTTP диалог входа в систему" #: include/views/configuration.host.discovery.edit.php:367 #: include/views/configuration.httpconf.edit.php:105 -#: include/views/configuration.httpconf.list.php:138 +#: include/views/configuration.httpconf.list.php:139 #: include/views/configuration.item.edit.php:411 #: include/views/configuration.item.prototype.edit.php:392 msgid "HTTP proxy" @@ -7476,16 +7484,16 @@ msgid "Hebrew (he_IL)" msgstr "Иврит (he_IL)" #: graphs.php:45 include/views/configuration.graph.edit.php:101 -#: include/views/configuration.graph.list.php:151 +#: include/views/configuration.graph.list.php:152 #: include/views/js/monitoring.sysmaps.js.php:123 #: include/views/js/monitoring.sysmaps.js.php:469 #: include/views/monitoring.sysmap.edit.php:105 -#: include/views/monitoring.sysmap.list.php:67 sysmaps.php:41 +#: include/views/monitoring.sysmap.list.php:68 sysmaps.php:41 msgid "Height" msgstr "Высота" -#: include/classes/helpers/CMenuHelper.php:348 -#: include/classes/helpers/CMenuHelper.php:351 +#: include/classes/helpers/CMenuHelper.php:350 +#: include/classes/helpers/CMenuHelper.php:353 #: include/views/general.login.php:87 msgid "Help" msgstr "Помощь" @@ -7494,11 +7502,11 @@ msgstr "Помощь" msgid "Hexadecimal to decimal" msgstr "Шестнадцатеричное в десятичное" -#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:253 +#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251 msgid "Hidden" msgstr "Скрыта" -#: jsLoader.php:367 +#: jsLoader.php:365 msgid "Hide debug" msgstr "Скрыть отладку" @@ -7525,11 +7533,11 @@ msgstr "Иерархия" msgid "High" msgstr "Высокая" -#: include/classes/core/ZBase.php:366 +#: include/classes/core/ZBase.php:364 msgid "High-contrast dark" msgstr "Высококонтрастная тёмная" -#: include/classes/core/ZBase.php:365 +#: include/classes/core/ZBase.php:363 msgid "High-contrast light" msgstr "Высококонтрастная светлая" @@ -7541,20 +7549,20 @@ msgstr "Подсвечивать всю строку" #: app/partials/monitoring.latest.view.html.php:52 #: app/partials/monitoring.latest.view.html.php:154 #: app/partials/monitoring.problem.filter.php:31 -#: app/views/administration.housekeeping.edit.php:125 +#: app/views/administration.housekeeping.edit.php:134 #: app/views/popup.acknowledge.edit.php:43 history.php:27 #: include/classes/macros/CMacrosResolverGeneral.php:910 -#: include/classes/screens/CScreenProblem.php:1319 -#: include/classes/screens/CScreenProblem.php:1324 +#: include/classes/screens/CScreenProblem.php:1320 +#: include/classes/screens/CScreenProblem.php:1325 #: include/classes/widgets/forms/CWidgetFormProblems.php:36 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:56 #: 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:348 +#: jsLoader.php:346 msgid "History" msgstr "История" -#: app/views/administration.housekeeping.edit.php:162 +#: app/views/administration.housekeeping.edit.php:171 msgid "History and trends compression" msgstr "Сжатие истории и динамики изменений" @@ -7610,7 +7618,7 @@ msgstr "Выравнивание по горизонтали" #: app/partials/monitoring.latest.view.html.php:40 #: app/partials/popup.operations.php:175 #: app/views/administration.queue.details.php:47 -#: app/views/monitoring.charts.view.php:85 +#: app/views/monitoring.charts.view.php:86 #: app/views/monitoring.dashboard.view.php:78 #: app/views/monitoring.widget.problems.view.php:58 #: app/views/popup.generic.php:92 app/views/popup.massupdate.host.php:290 @@ -7619,26 +7627,26 @@ msgstr "Выравнивание по горизонтали" #: include/classes/screens/CScreenHttpTest.php:112 #: include/classes/screens/CScreenProblem.php:871 #: include/classes/screens/CScreenProblem.php:895 -#: include/classes/screens/CScreenProblem.php:1165 +#: include/classes/screens/CScreenProblem.php:1166 #: include/classes/setup/CSetupWizard.php:439 #: include/classes/widgets/forms/CWidgetFormProblems.php:206 #: include/classes/widgets/forms/CWidgetFormProblems.php:207 #: include/hostgroups.inc.php:248 include/maps.inc.php:24 #: include/triggers.inc.php:1133 -#: include/views/configuration.graph.list.php:148 -#: include/views/configuration.host.discovery.list.php:191 +#: include/views/configuration.graph.list.php:149 +#: include/views/configuration.host.discovery.list.php:192 #: include/views/configuration.host.edit.php:203 #: include/views/configuration.host.prototype.edit.php:149 -#: include/views/configuration.httpconf.list.php:129 +#: include/views/configuration.httpconf.list.php:130 #: include/views/configuration.item.list.php:82 -#: include/views/configuration.triggers.list.php:188 -#: include/views/inventory.host.list.php:83 +#: include/views/configuration.triggers.list.php:189 +#: include/views/inventory.host.list.php:84 #: include/views/inventory.host.view.php:178 #: 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 items.php:982 items.php:1101 -#: jsLoader.php:255 jsLoader.php:349 report2.php:506 +#: jsLoader.php:253 jsLoader.php:347 report2.php:507 msgid "Host" msgid_plural "Hosts" msgstr[0] "Узел сети" @@ -7669,7 +7677,7 @@ msgstr "Узел сети \"%1$s\" наблюдается через прокс msgid "Host IP" msgstr "IP адрес узла сети" -#: app/views/administration.script.list.php:81 +#: app/views/administration.script.list.php:82 msgid "Host access" msgstr "Доступ к узлам сети" @@ -7678,7 +7686,7 @@ msgid "Host added" msgstr "Узел сети добавлен" #: app/controllers/CControllerPopupItemTest.php:1292 -#: app/views/popup.itemtestedit.view.php:98 +#: app/views/popup.itemtestedit.view.php:100 msgid "Host address" msgstr "Адрес хоста" @@ -7690,7 +7698,7 @@ msgstr "Доступность узла сети" msgid "Host cannot have more than one default interface of the same type." msgstr "У узла сети не может быть более одного интерфейса по умолчанию с одинаковым типом." -#: app/views/administration.proxy.list.php:77 hostinventoriesoverview.php:90 +#: app/views/administration.proxy.list.php:78 hostinventoriesoverview.php:90 msgid "Host count" msgstr "Количество узлов сети" @@ -7719,7 +7727,7 @@ msgstr[2] "Узлы сети активированы" #: app/partials/administration.usergroup.tagfilters.html.php:29 #: app/partials/popup.operations.php:183 #: app/views/administration.script.edit.php:224 -#: app/views/administration.script.list.php:80 +#: app/views/administration.script.list.php:81 #: app/views/administration.user.edit.php:383 #: app/views/monitoring.widget.problemhosts.view.php:31 #: app/views/monitoring.widget.problemsbysv.view.php:40 @@ -7728,7 +7736,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:258 +#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256 #: report2.php:398 msgid "Host group" msgstr "Группа узлов сети" @@ -7768,18 +7776,18 @@ msgstr "Группа узлов сети с ID \"%1$s\" недоступна." #: app/controllers/CControllerUsergroupGrouprightAdd.php:36 #: app/controllers/CControllerUsergroupTagfilterAdd.php:41 #: app/partials/common.filter.item.php:29 -#: app/partials/common.filter.trigger.php:51 +#: app/partials/common.filter.trigger.php:52 #: app/partials/configuration.filter.items.php:55 #: app/partials/monitoring.host.filter.php:83 #: app/partials/monitoring.problem.filter.php:35 #: app/partials/popup.operations.php:199 -#: app/views/monitoring.latest.view.php:55 -#: app/views/monitoring.web.view.php:50 +#: app/views/monitoring.latest.view.php:56 +#: app/views/monitoring.web.view.php:51 #: app/views/popup.condition.common.php:102 -#: app/views/popup.condition.common.php:277 +#: app/views/popup.condition.common.php:285 #: app/views/popup.massupdate.host.php:46 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266 -#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:150 +#: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150 #: include/classes/helpers/CRoleHelper.php:431 #: include/classes/widgets/forms/CWidgetFormDataOver.php:33 #: include/classes/widgets/forms/CWidgetFormHostAvail.php:31 @@ -7790,17 +7798,17 @@ msgstr "Группа узлов сети с ID \"%1$s\" недоступна." #: include/classes/widgets/forms/CWidgetFormTrigOver.php:48 #: include/classes/widgets/forms/CWidgetFormWeb.php:33 #: include/views/configuration.copy.elements.php:61 -#: include/views/configuration.graph.list.php:77 -#: include/views/configuration.host.discovery.list.php:63 +#: include/views/configuration.graph.list.php:78 +#: include/views/configuration.host.discovery.list.php:64 #: include/views/configuration.hostgroups.edit.php:26 #: include/views/configuration.hostgroups.list.php:27 #: include/views/configuration.host.list.php:62 #: include/views/configuration.httpconf.list.php:31 #: include/views/configuration.maintenance.edit.php:208 -#: include/views/configuration.maintenance.list.php:43 +#: include/views/configuration.maintenance.list.php:44 #: include/views/configuration.template.list.php:45 #: include/views/configuration.triggers.list.php:31 -#: include/views/inventory.host.list.php:45 +#: include/views/inventory.host.list.php:46 #: include/views/reports.toptriggers.php:37 report2.php:446 msgid "Host groups" msgstr "Группы узлов сети" @@ -7813,7 +7821,7 @@ msgstr "Группы узлов сети" msgid "Host interface" msgstr "Интерфейс узла сети" -#: app/partials/common.filter.trigger.php:153 +#: app/partials/common.filter.trigger.php:154 #: app/partials/monitoring.problem.filter.php:230 #: app/views/popup.lldoperation.php:278 hostinventories.php:26 #: include/views/inventory.host.list.php:26 @@ -7856,12 +7864,12 @@ msgstr "Сети узла сети" msgid "Host prototype" msgstr "Прототип узлов сети" -#: include/classes/api/services/CHostPrototype.php:970 +#: include/classes/api/services/CHostPrototype.php:975 #, c-format msgid "Host prototype \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "Прототип узлов сети \"%1$s\" уже существует у \"%2$s\", унаследованный из другого шаблона." -#: include/classes/api/services/CHostPrototype.php:958 +#: include/classes/api/services/CHostPrototype.php:963 #, c-format msgid "Host prototype \"%1$s\" already exists on \"%2$s\"." msgstr "Прототип узлов сети \"%1$s\" уже существует у \"%2$s\"." @@ -7870,7 +7878,7 @@ msgstr "Прототип узлов сети \"%1$s\" уже существуе msgid "Host prototype added" msgstr "Прототип узлов сети добавлен" -#: include/classes/api/services/CHostPrototype.php:1772 +#: include/classes/api/services/CHostPrototype.php:1777 msgid "Host prototype cannot have more than one default interface of the same type." msgstr "Прототип узлов сети не может иметь более одного интерфейса по умолчанию одного типа." @@ -7901,7 +7909,7 @@ msgstr "Прототип узла сети с видимым именем \"%1$s #: app/controllers/CControllerPopupImportCompare.php:175 #: include/html.inc.php:483 -#: include/views/configuration.host.discovery.list.php:306 +#: include/views/configuration.host.discovery.list.php:307 #: include/views/configuration.host.prototype.edit.php:35 #: include/views/configuration.host.prototype.list.php:27 msgid "Host prototypes" @@ -7955,16 +7963,16 @@ msgstr "Узел сети с таким же видимым именем \"%1$s\ #: app/controllers/CControllerPopupGeneric.php:123 #: app/controllers/CControllerPopupGeneric.php:147 #: app/partials/common.filter.item.php:46 -#: app/partials/common.filter.trigger.php:69 +#: app/partials/common.filter.trigger.php:70 #: app/partials/configuration.filter.items.php:72 #: app/partials/dataoverview.table.left.php:29 #: app/partials/monitoring.problem.filter.php:54 #: app/partials/trigoverview.table.left.php:29 -#: app/views/administration.proxy.list.php:80 +#: app/views/administration.proxy.list.php:81 #: app/views/monitoring.host.view.php:39 -#: app/views/monitoring.latest.view.php:72 -#: app/views/monitoring.web.view.php:69 -#: app/views/popup.condition.common.php:246 app/views/popup.import.php:30 +#: app/views/monitoring.latest.view.php:73 +#: app/views/monitoring.web.view.php:70 +#: app/views/popup.condition.common.php:254 app/views/popup.import.php:30 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214 #: include/classes/helpers/CMenuHelper.php:44 #: include/classes/helpers/CMenuHelper.php:96 @@ -7979,13 +7987,13 @@ msgstr "Узел сети с таким же видимым именем \"%1$s\ #: include/classes/widgets/forms/CWidgetFormTrigOver.php:57 #: include/classes/widgets/forms/CWidgetFormWeb.php:51 #: include/forms.inc.php:494 include/views/configuration.copy.elements.php:62 -#: include/views/configuration.graph.list.php:96 -#: include/views/configuration.host.discovery.list.php:80 -#: include/views/configuration.host.discovery.list.php:196 +#: include/views/configuration.graph.list.php:97 +#: include/views/configuration.host.discovery.list.php:81 +#: include/views/configuration.host.discovery.list.php:197 #: include/views/configuration.host.edit.php:30 -#: include/views/configuration.hostgroups.list.php:64 -#: include/views/configuration.hostgroups.list.php:168 -#: include/views/configuration.hostgroups.list.php:172 +#: include/views/configuration.hostgroups.list.php:65 +#: include/views/configuration.hostgroups.list.php:169 +#: include/views/configuration.hostgroups.list.php:173 #: include/views/configuration.host.list.php:29 #: include/views/configuration.httpconf.list.php:50 #: include/views/configuration.maintenance.edit.php:225 @@ -8014,8 +8022,8 @@ msgstr "Часы" #: app/controllers/CControllerAuditLogList.php:217 #: app/views/administration.housekeeping.edit.php:29 -#: app/views/administration.housekeeping.edit.php:181 -#: include/classes/helpers/CMenuHelper.php:234 include/html.inc.php:880 +#: app/views/administration.housekeeping.edit.php:190 +#: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:880 msgid "Housekeeping" msgstr "Очистка истории" @@ -8035,7 +8043,7 @@ msgstr "Я подтверждаю удаление всех преобразов msgid "ICMP ping" msgstr "ICMP ping" -#: app/views/reports.auditlog.list.php:91 +#: app/views/reports.auditlog.list.php:92 msgid "ID" msgstr "ID" @@ -8044,7 +8052,7 @@ msgid "IMAP" msgstr "IMAP" #: app/partials/monitoring.host.filter.php:103 -#: app/views/reports.auditlog.list.php:88 app/views/search.php:31 +#: app/views/reports.auditlog.list.php:89 app/views/search.php:31 #: include/views/configuration.host.list.php:103 msgid "IP" msgstr "IP" @@ -8062,7 +8070,7 @@ msgid "IP and DNS cannot be empty for host interface." msgstr "IP и DNS не могут быть пустыми для интерфейса узла сети." #: app/views/configuration.discovery.edit.php:63 -#: app/views/configuration.discovery.list.php:76 +#: app/views/configuration.discovery.list.php:77 msgid "IP range" msgstr "Диапазон IP адресов" @@ -8073,7 +8081,7 @@ msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit" msgstr "Диапазон IP \"%1$s\" превышает допустимый лимит адресов в \"%2$s\"" #: app/views/administration.script.edit.php:119 -#: app/views/administration.script.list.php:139 +#: app/views/administration.script.list.php:140 #: app/views/monitoring.widget.hostavail.view.php:30 #: app/views/popup.massupdate.host.php:292 #: include/classes/widgets/views/widget.hostavail.form.view.php:49 @@ -8159,7 +8167,7 @@ msgstr "Соответствие иконок обновлено" #: app/controllers/CControllerAuditLogList.php:211 #: app/views/administration.iconmap.edit.php:29 #: app/views/administration.iconmap.list.php:27 -#: include/classes/helpers/CMenuHelper.php:239 include/html.inc.php:882 +#: include/classes/helpers/CMenuHelper.php:241 include/html.inc.php:882 msgid "Icon mapping" msgstr "Соответствия иконок" @@ -8217,7 +8225,7 @@ msgstr "Исключения для атрибута sandbox в iframe" #: 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:259 +#: jsLoader.php:257 msgid "Image" msgstr "Изображение" @@ -8258,7 +8266,7 @@ msgstr "Изображение обновлено" #: app/views/administration.image.edit.php:29 #: app/views/administration.image.list.php:30 app/views/popup.import.php:44 -#: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:881 +#: include/classes/helpers/CMenuHelper.php:238 include/html.inc.php:881 msgid "Images" msgstr "Изображения" @@ -8266,7 +8274,7 @@ msgstr "Изображения" msgid "Images for all maps will be updated!" msgstr "Изображения для всех карт сетей будут обновлены!" -#: include/views/configuration.action.edit.php:238 +#: include/views/configuration.action.edit.php:239 msgid "Immediately" msgstr "Незамедлительно" @@ -8301,8 +8309,8 @@ msgstr "Невозможно отфильтровать по полю инвен msgid "In maintenance" msgstr "В обслуживании" -#: include/actions.inc.php:2052 -#: include/views/administration.auditacts.list.php:81 +#: include/actions.inc.php:2107 +#: include/views/administration.auditacts.list.php:82 msgid "In progress" msgstr "В работе" @@ -8376,9 +8384,9 @@ msgstr "Недоступный триггер" #: app/controllers/CControllerScheduledReportEdit.php:235 #: app/controllers/CControllerScheduledReportEdit.php:281 #: app/controllers/CControllerScheduledReportList.php:136 -#: include/actions.inc.php:1927 include/actions.inc.php:1950 -#: include/actions.inc.php:1955 -#: include/classes/helpers/CDashboardHelper.php:39 include/events.inc.php:248 +#: include/actions.inc.php:1982 include/actions.inc.php:2005 +#: include/actions.inc.php:2010 +#: include/classes/helpers/CDashboardHelper.php:39 include/events.inc.php:251 #: include/views/monitoring.sysmap.edit.php:81 msgid "Inaccessible user" msgstr "Недоступный пользователь" @@ -8389,7 +8397,7 @@ msgstr "Недоступная группа пользователей" #: app/partials/js/scheduledreport.subscription.js.php:165 #: app/partials/js/scheduledreport.subscription.js.php:181 -#: app/views/popup.scheduledreport.subscription.php:119 +#: app/views/popup.scheduledreport.subscription.php:118 #: app/views/popup.triggerwizard.php:54 app/views/popup.triggerwizard.php:111 msgid "Include" msgstr "Включено" @@ -8432,11 +8440,6 @@ msgstr "Некорректное значение \"permission\" \"%1$s\" в п msgid "Incorrect \"private\" value \"%1$s\" for map \"%2$s\"." msgstr "Некорректное значение \"private\" \"%1$s\" у карты сети \"%2$s\"." -#: include/classes/api/services/CService.php:1104 -#, c-format -msgid "Incorrect \"soft\" field value for dependency for service \"%1$s\"." -msgstr "Некорректное значение поля \"нежесткая\" для зависимости у услуги \"%1$s\"." - #: include/classes/api/services/CMap.php:649 #: include/classes/api/services/CMap.php:1132 #, c-format @@ -8476,120 +8479,106 @@ msgstr "Некорректный endpoint API Хранилища." msgid "Incorrect Vault token." msgstr "Некорректный токен Vault." -#: include/classes/api/services/CService.php:927 -#, c-format -msgid "Incorrect acceptable SLA for service \"%1$s\"." -msgstr "Некорректное значение допустимого SLA для услуги \"%1$s\"." - -#: include/classes/api/services/CAction.php:3050 -msgid "Incorrect acknowledgement action operationid." -msgstr "Некорректный operationid операции подтверждения." - -#: include/classes/validators/CActionCondValidator.php:121 +#: include/classes/validators/CActionCondValidator.php:122 msgid "Incorrect action condition discovery check." msgstr "Некорректная проверка обнаружения в условии действия." -#: include/classes/api/services/CAction.php:3126 +#: include/classes/api/services/CAction.php:3143 msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it." msgstr "Некорректная проверка обнаружения в условии действия. Проверка обнаружения не существует или у вас нет прав доступа к ней." -#: include/classes/validators/CActionCondValidator.php:94 +#: include/classes/validators/CActionCondValidator.php:95 msgid "Incorrect action condition discovery object." msgstr "Некорректный объект обнаружения в условии действия." -#: include/classes/api/services/CAction.php:3123 +#: include/classes/api/services/CAction.php:3140 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it." msgstr "Некорректное правило обнаружения в условии действия. Правило обнаружения не существует или у вас нет прав доступа к нему." -#: include/classes/validators/CActionCondValidator.php:139 +#: include/classes/validators/CActionCondValidator.php:140 msgid "Incorrect action condition discovery status." msgstr "Некорректное состояние обнаружения в условии действия." -#: include/classes/validators/CActionCondValidator.php:163 +#: include/classes/validators/CActionCondValidator.php:164 msgid "Incorrect action condition event type." msgstr "Некорректный тип события в условии действия." -#: include/classes/api/services/CAction.php:3111 +#: include/classes/api/services/CAction.php:3128 msgid "Incorrect action condition host group. Host group does not exist or you have no access to it." msgstr "Некорректная группа узлов сети в условии действия. Группа узлов сети не существует или у вас нет прав доступа к ней." -#: include/classes/api/services/CAction.php:3114 +#: include/classes/api/services/CAction.php:3131 msgid "Incorrect action condition host. Host does not exist or you have no access to it." msgstr "Некорректный узел сети в условии действия. Узел сети не существует или у вас нет прав доступа к нему." -#: include/classes/validators/CActionCondValidator.php:130 +#: include/classes/validators/CActionCondValidator.php:131 #, c-format msgid "Incorrect action condition port \"%1$s\"." msgstr "Некорректный порт \"%1$s\" в условии действия." -#: include/classes/api/services/CAction.php:3129 +#: include/classes/api/services/CAction.php:3146 msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it." msgstr "Некорректный прокси в условии действия. Прокси не существует или у вас нет прав доступа к нему." -#: include/classes/api/services/CAction.php:3117 +#: include/classes/api/services/CAction.php:3134 msgid "Incorrect action condition template. Template does not exist or you have no access to it." msgstr "Некорректный шаблон в условии действия. Шаблон не существует или у вас нет прав доступа к нему." -#: include/classes/validators/CActionCondValidator.php:154 +#: include/classes/validators/CActionCondValidator.php:155 msgid "Incorrect action condition trigger severity." msgstr "Некорректная важность триггера в условии действия." -#: include/classes/api/services/CAction.php:3120 +#: include/classes/api/services/CAction.php:3137 msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it." msgstr "Некорректный триггер в условии действия. Триггер не существует или у вас нет прав доступа к нему." -#: include/classes/validators/CActionCondValidator.php:195 +#: include/classes/validators/CActionCondValidator.php:197 msgid "Incorrect action condition type." msgstr "Некорректный тип условия действия." -#: include/classes/api/services/CAction.php:1882 +#: include/classes/api/services/CAction.php:1902 msgid "Incorrect action operation condition acknowledge type." msgstr "Некорректный тип подтверждения для условия в операции действия." -#: include/classes/api/services/CAction.php:1887 +#: include/classes/api/services/CAction.php:1907 msgid "Incorrect action operation condition type." msgstr "Некорректный тип условия в операции действия." -#: include/classes/api/services/CAction.php:1682 -#: include/classes/api/services/CAction.php:1688 +#: include/classes/api/services/CAction.php:1698 +#: include/classes/api/services/CAction.php:1704 msgid "Incorrect action operation escalation step values." msgstr "Некорректные значения шага эскалации для операции действия." -#: include/classes/api/services/CAction.php:1846 +#: include/classes/api/services/CAction.php:1866 msgid "Incorrect action operation host group. Host group does not exist or you have no access to this host group." msgstr "Некорректная группа узлов сети в операции действия. Группа узлов сети не существует или у вас нет прав доступа к этой группе узлов сети." -#: include/classes/api/services/CAction.php:1849 +#: include/classes/api/services/CAction.php:1869 msgid "Incorrect action operation host. Host does not exist or you have no access to this host." msgstr "Некорректный узел сети для операции действия. Узел сети не существует или у вас нет к нему доступа." -#: include/classes/api/services/CAction.php:1852 +#: include/classes/api/services/CAction.php:1872 msgid "Incorrect action operation template. Template does not exist or you have no access to this template." msgstr "Некорректный шаблон в операции действия. Шаблон не существует или у вас нет прав доступа к этому шаблону." -#: include/classes/api/services/CAction.php:1705 +#: include/classes/api/services/CAction.php:1721 #, c-format msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"." msgstr "Некорректный тип операции действия \"%1$s\" для источника событий \"%2$s\"." -#: include/classes/api/services/CAction.php:1858 +#: include/classes/api/services/CAction.php:1878 msgid "Incorrect action operation user group. User group does not exist or you have no access to this user group." msgstr "Некорректная группа пользователей для операции действия. Группа пользователей не существует или у вас нет к ней доступа." -#: include/classes/api/services/CAction.php:1855 +#: include/classes/api/services/CAction.php:1875 msgid "Incorrect action operation user. User does not exist or you have no access to this user." msgstr "Некорректный пользователь для операции действия. Пользователь не существует или у вас нет к нему доступа." -#: include/classes/api/services/CAction.php:2994 #: include/classes/api/services/CAction.php:3012 +#: include/classes/api/services/CAction.php:3030 msgid "Incorrect action operationid." msgstr "Некорректный operationid действия." -#: include/classes/api/services/CService.php:894 -#, c-format -msgid "Incorrect algorithm for service \"%1$s\"." -msgstr "Некорректный алгоритм для услуги \"%1$s\"." - #: include/regexp.inc.php:49 include/regexp.inc.php:89 #: include/regexp.inc.php:193 msgid "Incorrect arguments passed to function" @@ -8616,7 +8605,7 @@ msgstr "В функцию переданы некорректные аргуме #: include/classes/api/services/CDRule.php:206 #: include/classes/api/services/CDRule.php:348 #: include/classes/api/services/CDRule.php:542 -#: include/classes/api/services/CEvent.php:731 +#: include/classes/api/services/CEvent.php:732 #: include/classes/api/services/CHostInterface.php:296 #: include/classes/api/services/CHostInterface.php:328 #: include/classes/api/services/CHostInterface.php:401 @@ -8676,11 +8665,6 @@ msgstr "В функцию переданы некорректные аргуме msgid "Incorrect bulk value for interface." msgstr "Некорректное значение массового опроса для интерфейса." -#: include/classes/api/services/CService.php:911 -#, c-format -msgid "Incorrect calculate SLA value for service \"%1$s\"." -msgstr "Некорректное вычисляемое значение SLA для услуги \"%1$s\"." - #: include/classes/api/services/CHost.php:1031 #: include/classes/api/services/CHost.php:1923 #: include/classes/api/services/CHost.php:2212 @@ -8700,7 +8684,7 @@ msgstr "Использованы некорректные символы в им msgid "Incorrect characters used for template name \"%1$s\"." msgstr "Использованы некорректные символы в имени шаблона \"%1$s\"." -#: include/classes/api/services/CAction.php:2588 +#: include/classes/api/services/CAction.php:2603 #, c-format msgid "Incorrect conditions for action \"%1$s\"." msgstr "Некорректные условия в действии \"%1$s\"." @@ -8714,7 +8698,7 @@ msgstr "Некорректные условия в правиле обнаруж msgid "Incorrect correlation ID." msgstr "Некорректный ID корреляции." -#: include/classes/api/services/CAction.php:2594 +#: include/classes/api/services/CAction.php:2609 #, c-format msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s." msgstr "Некорректное пользовательское выражение \"%2$s\" для действия \"%1$s\": %3$s." @@ -8740,12 +8724,12 @@ msgstr "Некорректное пользовательское выражен msgid "Incorrect default charset for Zabbix database: %1$s." msgstr "Некорректная кодовая страница по умолчанию для Zabbix базы данных: %1$s." -#: include/classes/api/services/CEvent.php:509 +#: include/classes/api/services/CEvent.php:510 #: include/classes/api/services/CProblem.php:375 msgid "Incorrect evaltype value." msgstr "Некорректное значение evaltype." -#: include/classes/validators/event/CEventSourceObjectValidator.php:66 +#: include/classes/validators/event/CEventSourceObjectValidator.php:69 #, c-format msgid "Incorrect event object \"%1$s\" (%2$s) for event source \"%3$s\" (%4$s), only the following objects are supported: %5$s." msgstr "Некорректный \"%1$s\" (%2$s) объект события для \"%3$s\" (%4$s) источника события, поддерживаются только следующие объекты: %5$s." @@ -8778,7 +8762,7 @@ msgstr "Некорректный путь к файлу для \"%1$s\": %2$s." msgid "Incorrect file upload." msgstr "Некорректный загружаемый файл." -#: include/classes/api/services/CAction.php:2628 +#: include/classes/api/services/CAction.php:2643 #, c-format msgid "Incorrect filter condition formula ID for action \"%1$s\"." msgstr "Некорректный ID формулы условия фильтра для действия \"%1$s\"." @@ -8803,8 +8787,8 @@ msgstr "Некорректный макрос условия фильтра дл msgid "Incorrect filter condition macro for override \"%1$s\"." msgstr "Некорректный макрос условия фильтра для замещения \"%1$s\"." -#: include/classes/api/services/CAction.php:1605 -#: include/classes/api/services/CAction.php:2633 +#: include/classes/api/services/CAction.php:1616 +#: include/classes/api/services/CAction.php:2648 #, c-format msgid "Incorrect filter condition operator for action \"%1$s\"." msgstr "Некорректный оператор условия фильтра для действия \"%1$s\"." @@ -8814,8 +8798,8 @@ msgstr "Некорректный оператор условия фильтра msgid "Incorrect filter condition operator for discovery rule \"%1$s\"." msgstr "Некорректный оператор условия фильтра для правила обнаружения \"%1$s\"." -#: include/classes/api/services/CAction.php:1598 -#: include/classes/api/services/CAction.php:2617 +#: include/classes/api/services/CAction.php:1609 +#: include/classes/api/services/CAction.php:2632 #, c-format msgid "Incorrect filter condition type for action \"%1$s\"." msgstr "Некорректный тип условия фильтра для действия \"%1$s\"." @@ -8830,9 +8814,9 @@ msgstr "Использована некорректная функция" msgid "Incorrect image index." msgstr "Некорректный индекс изображения." -#: include/classes/api/services/CAction.php:2786 -#: include/classes/api/services/CAction.php:2798 -#: include/classes/api/services/CAction.php:2810 +#: include/classes/api/services/CAction.php:2803 +#: include/classes/api/services/CAction.php:2815 +#: include/classes/api/services/CAction.php:2827 #: include/classes/api/services/CHostInterface.php:675 #: include/classes/api/services/CHost.php:1014 #: include/classes/api/services/CHost.php:1917 @@ -8865,7 +8849,7 @@ msgstr "Указан некорректный порт \"%1$s\" интерфей msgid "Incorrect inventory field \"%1$s\"." msgstr "Некорректное поле инвентарных данных \"%1$s\"." -#: include/classes/api/services/CAction.php:1836 +#: include/classes/api/services/CAction.php:1856 msgid "Incorrect inventory mode in action operation." msgstr "Некорректный режим инвентарных данных в операции действия." @@ -8873,7 +8857,7 @@ msgstr "Некорректный режим инвентарных данных msgid "Incorrect item for axis value." msgstr "Некорректный элемент данных для значения оси." -#: include/classes/api/services/CTriggerGeneral.php:1674 +#: include/classes/api/services/CTriggerGeneral.php:1660 #, c-format msgid "Incorrect item key \"%1$s\" provided for trigger expression on \"%2$s\"." msgstr "В выражении триггера \"%2$s\" указан некорректный ключ элемента данных \"%1$s\"." @@ -8883,7 +8867,7 @@ msgstr "В выражении триггера \"%2$s\" указан некор msgid "Incorrect item value type" msgstr "Некорректный тип значений элемента данных" -#: include/classes/api/services/CTriggerGeneral.php:1681 +#: include/classes/api/services/CTriggerGeneral.php:1667 #, c-format msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"." msgstr "Указан некорректный тип элемента данных \"%1$s\" для функции триггера \"%2$s\"." @@ -8915,7 +8899,7 @@ msgstr "Некорректный ID типа оповещений." msgid "Incorrect method \"%1$s.%2$s\"." msgstr "Некорректный метод \"%1$s.%2$s\"." -#: include/classes/api/services/CEvent.php:497 +#: include/classes/api/services/CEvent.php:498 #: include/classes/api/services/CProblem.php:363 msgid "Incorrect object value." msgstr "Некорректное значение объекта." @@ -8925,21 +8909,21 @@ msgstr "Некорректное значение объекта." msgid "Incorrect parameter \"%1$s\" value: %2$s." msgstr "Некорректное значение \"%1$s\" параметра: %2$s." -#: include/classes/api/services/CAction.php:2704 +#: include/classes/api/services/CAction.php:2719 #, c-format msgid "Incorrect parameter for action \"%1$s\"." msgstr "Некорректный параметр для действия \"%1$s\"." -#: include/classes/api/services/CAction.php:1037 +#: include/classes/api/services/CAction.php:1048 msgid "Incorrect parameter for operations." msgstr "Некорректный параметр для операций." -#: include/classes/api/services/CAction.php:2873 +#: include/classes/api/services/CAction.php:2890 #, c-format msgid "Incorrect parameters for action update method \"%1$s\"." msgstr "Некорректные параметры для метода обновления действия \"%1$s\"." -#: include/classes/api/services/CAction.php:999 +#: include/classes/api/services/CAction.php:1010 msgid "Incorrect parameters for condition." msgstr "Некорректные параметры для условии." @@ -8948,15 +8932,6 @@ msgstr "Некорректные параметры для условии." msgid "Incorrect parameters for maintenance." msgstr "Некорректные параметры для обслуживания." -#: include/classes/api/services/CService.php:969 -#, c-format -msgid "Incorrect parent for service \"%1$s\"." -msgstr "Некорректный родитель для услуги \"%1$s\"." - -#: include/classes/api/services/CService.php:972 -msgid "Incorrect parent service." -msgstr "Некорректная родительская услуга." - #: app/controllers/CControllerPopupDiscoveryCheck.php:58 #: include/classes/api/services/CDRule.php:496 msgid "Incorrect port range." @@ -8974,24 +8949,17 @@ msgstr "Некорректное регулярное выражение \"%1$s\ msgid "Incorrect response received from Zabbix server \"%1$s\"." msgstr "Получен некорректный ответ от Zabbix сервера \"%1$s\"." -#: include/services.inc.php:500 include/services.inc.php:509 +#: app/controllers/CControllerServiceTimeValidate.php:62 +#: app/controllers/CControllerServiceTimeValidate.php:83 msgid "Incorrect service end time." msgstr "Некорректное время завершения услуги." -#: include/services.inc.php:497 include/services.inc.php:506 +#: app/controllers/CControllerServiceTimeValidate.php:53 +#: app/controllers/CControllerServiceTimeValidate.php:75 msgid "Incorrect service start time." msgstr "Некорректное время начала услуги." -#: include/services.inc.php:491 -msgid "Incorrect service time type." -msgstr "Некорректный тип времени услуги." - -#: include/classes/api/services/CService.php:942 -#, c-format -msgid "Incorrect sort order for service \"%1$s\"." -msgstr "Некорректный порядок сортировки у услуги \"%1$s\"." - -#: include/classes/api/services/CEvent.php:490 +#: include/classes/api/services/CEvent.php:491 #: include/classes/api/services/CProblem.php:356 msgid "Incorrect source value." msgstr "Некорректное значение источника." @@ -9002,20 +8970,10 @@ msgstr "Некорректное значение источника." msgid "Incorrect status for host \"%1$s\"." msgstr "Некорректное состояние для узла сети \"%1$s\"." -#: include/classes/api/services/CService.php:990 -#, c-format -msgid "Incorrect status for service \"%1$s\"." -msgstr "Некорректное состояние для услуги \"%1$s\"." - #: include/classes/api/services/CHttpTest.php:732 msgid "Incorrect templated web scenario step count." msgstr "Некорректное количество шагов у шаблонного веб-сценария." -#: include/classes/api/services/CService.php:955 -#, c-format -msgid "Incorrect trigger ID for service \"%1$s\"." -msgstr "Некорректный ID триггера для услуги \"%1$s\"." - #: include/classes/triggers/CTextTriggerConstructor.php:130 msgid "Incorrect trigger expression" msgstr "Некорректное выражение триггера" @@ -9026,26 +8984,26 @@ msgid "Incorrect trigger expression." msgstr "Некорректное выражение триггера." #: include/classes/api/services/CTriggerGeneral.php:587 -#: include/classes/api/services/CTriggerGeneral.php:1447 +#: include/classes/api/services/CTriggerGeneral.php:1433 #, c-format msgid "Incorrect trigger expression. Host \"%1$s\" does not exist or you have no access to this host." msgstr "Некорректное выражение триггера. Узел сети \"%1$s\" не существует или у вас нет прав доступа к этому узлу сети." -#: include/classes/api/services/CTriggerGeneral.php:1448 +#: include/classes/api/services/CTriggerGeneral.php:1434 msgid "Incorrect trigger expression. Trigger expression elements should not belong to a template and a host simultaneously." msgstr "Некорректное выражение у триггера. Элементы выражения триггера не должны принадлежать шаблону и узлу сети одновременно." #: include/classes/api/services/CTriggerGeneral.php:588 -#: include/classes/api/services/CTriggerGeneral.php:1453 +#: include/classes/api/services/CTriggerGeneral.php:1439 #, c-format msgid "Incorrect trigger prototype expression. Host \"%1$s\" does not exist or you have no access to this host." msgstr "Некорректное выражение прототипа триггеров. Узел сети \"%1$s\" не существует или у вас нет прав доступа к нему." -#: include/classes/api/services/CTriggerGeneral.php:1454 +#: include/classes/api/services/CTriggerGeneral.php:1440 msgid "Incorrect trigger prototype expression. Trigger prototype expression elements should not belong to a template and a host simultaneously." msgstr "Некорректное выражение прототипа триггеров. Элементы выражения прототипа триггеров не должны быть от шаблона и узла сети одновременно." -#: include/classes/api/services/CAction.php:2581 +#: include/classes/api/services/CAction.php:2596 #, c-format msgid "Incorrect type of calculation for action \"%1$s\"." msgstr "Некорректный тип вычисления для действия \"%1$s\"." @@ -9060,6 +9018,10 @@ msgstr "Некорректный тип вычисления для коррел msgid "Incorrect type of calculation for discovery rule \"%1$s\"." msgstr "Некорректный тип вычисления для правила обнаружения \"%1$s\"." +#: include/classes/api/services/CAction.php:3067 +msgid "Incorrect update action operationid." +msgstr "" + #: include/classes/api/services/CMap.php:764 #: include/classes/api/services/CMap.php:1232 #, c-format @@ -9081,11 +9043,11 @@ msgid "Incorrect user name or password or account is temporarily blocked." msgstr "Некорректные имя пользователя или пароль или аккаунт временно заблокирован." #: app/controllers/CControllerPopupGeneric.php:480 -#: include/classes/api/services/CAction.php:813 -#: include/classes/api/services/CAction.php:856 -#: include/classes/api/services/CAction.php:915 -#: include/classes/api/services/CAction.php:2750 -#: include/classes/api/services/CAction.php:2895 +#: include/classes/api/services/CAction.php:821 +#: include/classes/api/services/CAction.php:864 +#: include/classes/api/services/CAction.php:926 +#: include/classes/api/services/CAction.php:2767 +#: include/classes/api/services/CAction.php:2913 #: include/classes/api/services/CDRule.php:244 #: include/classes/api/services/CDRule.php:251 #: include/classes/api/services/CDRule.php:299 @@ -9115,7 +9077,7 @@ msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$ msgstr "Некорректное значение \"%1$s\" для \"%2$s\" поля: должно быть между %3$s и %4$s, и должно содержать не более %5$s цифр после десятичной точки." #: app/controllers/CControllerAuthenticationUpdate.php:151 -#: include/classes/api/services/CAction.php:1736 include/validate.inc.php:341 +#: include/classes/api/services/CAction.php:1752 include/validate.inc.php:341 #, c-format 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." @@ -9223,10 +9185,10 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: app/controllers/CControllerUsergroupTagfilterAdd.php:41 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 -#: include/classes/api/services/CAction.php:1697 -#: include/classes/api/services/CAction.php:1773 -#: include/classes/api/services/CAction.php:1842 -#: include/classes/api/services/CAction.php:2839 +#: include/classes/api/services/CAction.php:1713 +#: include/classes/api/services/CAction.php:1793 +#: include/classes/api/services/CAction.php:1862 +#: include/classes/api/services/CAction.php:2856 #: include/classes/api/services/CConfiguration.php:167 #: include/classes/api/services/CCorrelation.php:1052 #: include/classes/api/services/CCorrelation.php:1087 @@ -9254,14 +9216,14 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/api/services/CDRule.php:513 #: include/classes/api/services/CDRule.php:547 #: include/classes/api/services/CDRule.php:555 -#: include/classes/api/services/CEvent.php:742 -#: include/classes/api/services/CEvent.php:755 -#: include/classes/api/services/CEvent.php:760 -#: include/classes/api/services/CEvent.php:765 -#: include/classes/api/services/CEvent.php:770 -#: include/classes/api/services/CEvent.php:778 -#: include/classes/api/services/CEvent.php:819 -#: include/classes/api/services/CEvent.php:876 +#: include/classes/api/services/CEvent.php:743 +#: include/classes/api/services/CEvent.php:756 +#: include/classes/api/services/CEvent.php:761 +#: include/classes/api/services/CEvent.php:766 +#: include/classes/api/services/CEvent.php:771 +#: include/classes/api/services/CEvent.php:779 +#: include/classes/api/services/CEvent.php:820 +#: include/classes/api/services/CEvent.php:877 #: include/classes/api/services/CHost.php:972 #: include/classes/api/services/CHost.php:1815 #: include/classes/api/services/CHost.php:1821 @@ -9403,21 +9365,21 @@ msgstr "Некорректное значение для \"%1$s\" поля." #: include/classes/import/CConfigurationImport.php:2813 #: include/classes/import/CConfigurationImport.php:2822 #: include/classes/import/CConfigurationImport.php:2828 -#: include/classes/validators/CActionCondValidator.php:65 -#: include/classes/validators/CActionCondValidator.php:71 -#: include/classes/validators/CActionCondValidator.php:82 -#: include/classes/validators/CActionCondValidator.php:90 -#: include/classes/validators/CActionCondValidator.php:109 -#: include/classes/validators/CActionCondValidator.php:118 -#: include/classes/validators/CActionCondValidator.php:127 -#: include/classes/validators/CActionCondValidator.php:136 -#: include/classes/validators/CActionCondValidator.php:145 -#: include/classes/validators/CActionCondValidator.php:151 -#: include/classes/validators/CActionCondValidator.php:160 -#: include/classes/validators/CActionCondValidator.php:174 -#: include/classes/validators/CActionCondValidator.php:180 -#: include/classes/validators/CActionCondValidator.php:184 -#: include/classes/validators/CActionCondValidator.php:190 +#: include/classes/validators/CActionCondValidator.php:66 +#: include/classes/validators/CActionCondValidator.php:72 +#: include/classes/validators/CActionCondValidator.php:83 +#: include/classes/validators/CActionCondValidator.php:91 +#: include/classes/validators/CActionCondValidator.php:110 +#: include/classes/validators/CActionCondValidator.php:119 +#: include/classes/validators/CActionCondValidator.php:128 +#: include/classes/validators/CActionCondValidator.php:137 +#: include/classes/validators/CActionCondValidator.php:146 +#: include/classes/validators/CActionCondValidator.php:152 +#: include/classes/validators/CActionCondValidator.php:161 +#: include/classes/validators/CActionCondValidator.php:176 +#: include/classes/validators/CActionCondValidator.php:182 +#: include/classes/validators/CActionCondValidator.php:186 +#: include/classes/validators/CActionCondValidator.php:192 #: include/classes/validators/CEventCorrCondValidator.php:47 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 @@ -9465,23 +9427,25 @@ msgstr "Бесконечно" #: app/controllers/CControllerPopupMediatypeTestSend.php:172 #: app/partials/monitoring.latest.view.html.php:60 #: app/partials/scheduledreport.table.html.php:45 +#: app/views/monitoring.service.list.edit.php:90 +#: app/views/monitoring.service.list.php:86 #: app/views/monitoring.widget.actionlog.view.php:39 #: app/views/monitoring.widget.problems.view.php:57 -#: include/actions.inc.php:1756 include/actions.inc.php:1839 +#: include/actions.inc.php:1811 include/actions.inc.php:1894 #: include/blocks.inc.php:717 include/classes/screens/CScreenProblem.php:870 #: include/classes/screens/CScreenProblem.php:894 -#: include/views/administration.auditacts.list.php:68 -#: include/views/configuration.graph.list.php:140 -#: include/views/configuration.host.discovery.list.php:201 -#: include/views/configuration.hostgroups.list.php:67 +#: include/views/administration.auditacts.list.php:69 +#: include/views/configuration.graph.list.php:141 +#: include/views/configuration.host.discovery.list.php:202 +#: include/views/configuration.hostgroups.list.php:68 #: include/views/configuration.host.list.php:161 -#: include/views/configuration.httpconf.list.php:141 +#: include/views/configuration.httpconf.list.php:142 #: include/views/configuration.item.list.php:94 #: include/views/configuration.trigger.prototype.edit.php:200 #: include/views/configuration.trigger.prototype.edit.php:395 #: include/views/configuration.triggers.edit.php:222 #: include/views/configuration.triggers.edit.php:419 -#: include/views/configuration.triggers.list.php:195 +#: include/views/configuration.triggers.list.php:196 msgid "Info" msgstr "Инфо" @@ -9536,7 +9500,7 @@ msgid "Insert" msgstr "Вставить" #: include/views/configuration.trigger.prototype.edit.php:136 -#: include/views/configuration.triggers.edit.php:162 jsLoader.php:342 +#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340 msgid "Insert expression" msgstr "Вставить выражение" @@ -9605,12 +9569,12 @@ msgstr "Внутренний" msgid "Internal JSON-RPC error." msgstr "Внутренняя ошибка JSON-RPC." -#: include/classes/helpers/CMenuHelper.php:194 -#: include/views/configuration.action.list.php:30 +#: include/classes/helpers/CMenuHelper.php:199 +#: include/views/configuration.action.list.php:31 msgid "Internal actions" msgstr "Внутренние действия" -#: app/views/administration.housekeeping.edit.php:58 +#: app/views/administration.housekeeping.edit.php:67 msgid "Internal data storage period" msgstr "Период хранения внутренних данных" @@ -9620,21 +9584,21 @@ msgstr "Период хранения внутренних данных" #: include/classes/api/services/CTriggerGeneral.php:1035 #: include/classes/api/services/CTriggerGeneral.php:1162 #: include/classes/api/services/CTriggerGeneral.php:1267 -#: include/classes/api/services/CTriggerGeneral.php:1458 -#: include/classes/api/services/CTriggerGeneral.php:1863 +#: include/classes/api/services/CTriggerGeneral.php:1444 +#: include/classes/api/services/CTriggerGeneral.php:1849 #: include/classes/core/CJsonRpc.php:191 #: include/classes/import/validators/CXmlValidatorGeneral.php:226 #: include/classes/widgets/fields/CWidgetField.php:103 msgid "Internal error." msgstr "Внутренняя ошибка." -#: app/views/popup.mediatype.message.php:64 -#: include/classes/helpers/CMediatypeHelper.php:130 +#: app/views/popup.mediatype.message.php:73 +#: include/classes/helpers/CMediatypeHelper.php:194 msgid "Internal problem" msgstr "Внутренняя проблема" -#: app/views/popup.mediatype.message.php:67 -#: include/classes/helpers/CMediatypeHelper.php:141 +#: app/views/popup.mediatype.message.php:76 +#: include/classes/helpers/CMediatypeHelper.php:205 msgid "Internal problem recovery" msgstr "Восстановление внутренней проблемы" @@ -9643,17 +9607,17 @@ msgid "Internet Explorer" msgstr "Internet Explorer" #: app/partials/monitoring.latest.view.html.php:51 -#: app/views/configuration.discovery.list.php:78 +#: app/views/configuration.discovery.list.php:79 #: app/views/popup.lldoperation.php:115 -#: app/views/popup.massupdate.item.php:226 include/forms.inc.php:565 +#: app/views/popup.massupdate.item.php:226 +#: app/views/popup.service.edit.php:133 include/forms.inc.php:565 #: include/views/configuration.host.discovery.edit.php:584 -#: include/views/configuration.host.discovery.list.php:198 -#: include/views/configuration.httpconf.list.php:135 +#: include/views/configuration.host.discovery.list.php:199 +#: include/views/configuration.httpconf.list.php:136 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.list.php:88 #: include/views/configuration.item.prototype.edit.php:654 #: include/views/configuration.item.prototype.list.php:61 -#: include/views/configuration.services.edit.php:180 msgid "Interval" msgstr "Интервал" @@ -9679,7 +9643,7 @@ msgstr "Ошибочный запрос." msgid "Invalid YAML file contents" msgstr "Ошибочное содержимое YAML файла." -#: include/classes/validators/CActionCondValidator.php:112 +#: include/classes/validators/CActionCondValidator.php:113 #, c-format msgid "Invalid action condition: %1$s." msgstr "Ошибочное условие действия: %1$s." @@ -9747,9 +9711,6 @@ msgstr "Ошибочный ключ \"%1$s\": %2$s." msgid "Invalid macro \"%1$s\": %2$s." msgstr "Ошибочный макрос \"%1$s\": %2$s." -#: include/classes/api/services/CService.php:216 -#: include/classes/api/services/CService.php:400 -#: include/classes/api/services/CService.php:1233 #: include/classes/core/CJsonRpc.php:187 msgid "Invalid method parameters." msgstr "Ошибочные параметры метода." @@ -9778,15 +9739,15 @@ msgstr "Ошибочные параметры метода." #: include/classes/api/services/CGraphGeneral.php:605 #: include/classes/api/services/CGraphGeneral.php:728 #: include/classes/api/services/CHostPrototype.php:322 -#: include/classes/api/services/CHostPrototype.php:1672 #: include/classes/api/services/CHostPrototype.php:1677 -#: include/classes/api/services/CHostPrototype.php:1684 +#: include/classes/api/services/CHostPrototype.php:1682 #: include/classes/api/services/CHostPrototype.php:1689 -#: include/classes/api/services/CHostPrototype.php:1700 +#: include/classes/api/services/CHostPrototype.php:1694 #: include/classes/api/services/CHostPrototype.php:1705 -#: include/classes/api/services/CHostPrototype.php:1712 -#: include/classes/api/services/CHostPrototype.php:1718 -#: include/classes/api/services/CHostPrototype.php:1728 +#: include/classes/api/services/CHostPrototype.php:1710 +#: include/classes/api/services/CHostPrototype.php:1717 +#: include/classes/api/services/CHostPrototype.php:1723 +#: include/classes/api/services/CHostPrototype.php:1733 #: include/classes/api/services/CHttpTest.php:372 #: include/classes/api/services/CItemGeneral.php:603 #: include/classes/api/services/CItemGeneral.php:616 @@ -9811,8 +9772,8 @@ msgstr "Ошибочные параметры метода." #: include/classes/api/services/CScript.php:1031 #: include/classes/api/services/CTemplate.php:656 #: include/classes/api/services/CTriggerGeneral.php:665 -#: include/classes/api/services/CTriggerGeneral.php:1815 -#: include/classes/api/services/CTriggerGeneral.php:1834 +#: include/classes/api/services/CTriggerGeneral.php:1801 +#: include/classes/api/services/CTriggerGeneral.php:1820 #: include/classes/api/services/CUser.php:846 #: include/classes/api/services/CUser.php:857 #: include/classes/api/services/CValueMap.php:432 @@ -9839,81 +9800,82 @@ msgstr "Ошибочные параметры метода." #: include/classes/validators/CApiInputValidator.php:584 #: include/classes/validators/CApiInputValidator.php:625 #: include/classes/validators/CApiInputValidator.php:630 -#: include/classes/validators/CApiInputValidator.php:684 -#: include/classes/validators/CApiInputValidator.php:718 +#: include/classes/validators/CApiInputValidator.php:685 #: include/classes/validators/CApiInputValidator.php:723 -#: include/classes/validators/CApiInputValidator.php:779 -#: include/classes/validators/CApiInputValidator.php:812 -#: include/classes/validators/CApiInputValidator.php:817 -#: include/classes/validators/CApiInputValidator.php:858 -#: include/classes/validators/CApiInputValidator.php:863 -#: include/classes/validators/CApiInputValidator.php:868 -#: include/classes/validators/CApiInputValidator.php:904 -#: include/classes/validators/CApiInputValidator.php:959 -#: include/classes/validators/CApiInputValidator.php:966 -#: include/classes/validators/CApiInputValidator.php:993 -#: include/classes/validators/CApiInputValidator.php:1038 -#: include/classes/validators/CApiInputValidator.php:1065 -#: include/classes/validators/CApiInputValidator.php:1070 -#: include/classes/validators/CApiInputValidator.php:1077 -#: include/classes/validators/CApiInputValidator.php:1108 -#: include/classes/validators/CApiInputValidator.php:1153 -#: include/classes/validators/CApiInputValidator.php:1158 -#: include/classes/validators/CApiInputValidator.php:1196 -#: include/classes/validators/CApiInputValidator.php:1201 -#: include/classes/validators/CApiInputValidator.php:1206 -#: include/classes/validators/CApiInputValidator.php:1251 -#: include/classes/validators/CApiInputValidator.php:1260 -#: include/classes/validators/CApiInputValidator.php:1266 -#: include/classes/validators/CApiInputValidator.php:1294 -#: include/classes/validators/CApiInputValidator.php:1304 -#: include/classes/validators/CApiInputValidator.php:1310 -#: include/classes/validators/CApiInputValidator.php:1348 -#: include/classes/validators/CApiInputValidator.php:1360 -#: include/classes/validators/CApiInputValidator.php:1369 -#: include/classes/validators/CApiInputValidator.php:1376 -#: include/classes/validators/CApiInputValidator.php:1381 -#: include/classes/validators/CApiInputValidator.php:1423 -#: include/classes/validators/CApiInputValidator.php:1440 -#: include/classes/validators/CApiInputValidator.php:1466 -#: include/classes/validators/CApiInputValidator.php:1471 -#: include/classes/validators/CApiInputValidator.php:1495 -#: include/classes/validators/CApiInputValidator.php:1500 -#: include/classes/validators/CApiInputValidator.php:1526 -#: include/classes/validators/CApiInputValidator.php:1533 -#: include/classes/validators/CApiInputValidator.php:1560 -#: include/classes/validators/CApiInputValidator.php:1567 -#: include/classes/validators/CApiInputValidator.php:1594 -#: include/classes/validators/CApiInputValidator.php:1603 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1656 -#: include/classes/validators/CApiInputValidator.php:1667 -#: include/classes/validators/CApiInputValidator.php:1700 -#: include/classes/validators/CApiInputValidator.php:1755 -#: include/classes/validators/CApiInputValidator.php:1842 -#: include/classes/validators/CApiInputValidator.php:1847 -#: include/classes/validators/CApiInputValidator.php:1874 -#: include/classes/validators/CApiInputValidator.php:1884 -#: include/classes/validators/CApiInputValidator.php:1916 -#: include/classes/validators/CApiInputValidator.php:1928 -#: include/classes/validators/CApiInputValidator.php:1960 -#: include/classes/validators/CApiInputValidator.php:1971 -#: include/classes/validators/CApiInputValidator.php:1994 -#: include/classes/validators/CApiInputValidator.php:2009 -#: include/classes/validators/CApiInputValidator.php:2062 -#: include/classes/validators/CApiInputValidator.php:2072 -#: include/classes/validators/CApiInputValidator.php:2082 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2113 -#: include/classes/validators/CApiInputValidator.php:2135 -#: include/classes/validators/CApiInputValidator.php:2155 +#: include/classes/validators/CApiInputValidator.php:728 +#: include/classes/validators/CApiInputValidator.php:784 +#: include/classes/validators/CApiInputValidator.php:809 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:888 +#: include/classes/validators/CApiInputValidator.php:893 +#: include/classes/validators/CApiInputValidator.php:898 +#: include/classes/validators/CApiInputValidator.php:934 +#: include/classes/validators/CApiInputValidator.php:989 +#: include/classes/validators/CApiInputValidator.php:996 +#: include/classes/validators/CApiInputValidator.php:1023 +#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1095 +#: include/classes/validators/CApiInputValidator.php:1100 +#: include/classes/validators/CApiInputValidator.php:1107 +#: include/classes/validators/CApiInputValidator.php:1138 +#: include/classes/validators/CApiInputValidator.php:1183 +#: include/classes/validators/CApiInputValidator.php:1188 +#: include/classes/validators/CApiInputValidator.php:1226 +#: include/classes/validators/CApiInputValidator.php:1231 +#: include/classes/validators/CApiInputValidator.php:1236 +#: include/classes/validators/CApiInputValidator.php:1281 +#: include/classes/validators/CApiInputValidator.php:1290 +#: include/classes/validators/CApiInputValidator.php:1296 +#: include/classes/validators/CApiInputValidator.php:1324 +#: include/classes/validators/CApiInputValidator.php:1334 +#: include/classes/validators/CApiInputValidator.php:1340 +#: include/classes/validators/CApiInputValidator.php:1378 +#: include/classes/validators/CApiInputValidator.php:1390 +#: include/classes/validators/CApiInputValidator.php:1399 +#: include/classes/validators/CApiInputValidator.php:1406 +#: include/classes/validators/CApiInputValidator.php:1411 +#: include/classes/validators/CApiInputValidator.php:1453 +#: include/classes/validators/CApiInputValidator.php:1470 +#: include/classes/validators/CApiInputValidator.php:1496 +#: include/classes/validators/CApiInputValidator.php:1501 +#: include/classes/validators/CApiInputValidator.php:1525 +#: include/classes/validators/CApiInputValidator.php:1530 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1563 +#: include/classes/validators/CApiInputValidator.php:1590 +#: include/classes/validators/CApiInputValidator.php:1597 +#: include/classes/validators/CApiInputValidator.php:1624 +#: include/classes/validators/CApiInputValidator.php:1633 +#: include/classes/validators/CApiInputValidator.php:1670 +#: include/classes/validators/CApiInputValidator.php:1686 +#: include/classes/validators/CApiInputValidator.php:1697 +#: include/classes/validators/CApiInputValidator.php:1730 +#: include/classes/validators/CApiInputValidator.php:1785 +#: include/classes/validators/CApiInputValidator.php:1872 +#: include/classes/validators/CApiInputValidator.php:1877 +#: include/classes/validators/CApiInputValidator.php:1904 +#: include/classes/validators/CApiInputValidator.php:1914 +#: include/classes/validators/CApiInputValidator.php:1946 +#: include/classes/validators/CApiInputValidator.php:1958 +#: include/classes/validators/CApiInputValidator.php:1990 +#: include/classes/validators/CApiInputValidator.php:2001 +#: include/classes/validators/CApiInputValidator.php:2024 +#: include/classes/validators/CApiInputValidator.php:2039 +#: include/classes/validators/CApiInputValidator.php:2092 +#: include/classes/validators/CApiInputValidator.php:2102 +#: include/classes/validators/CApiInputValidator.php:2112 +#: include/classes/validators/CApiInputValidator.php:2136 +#: include/classes/validators/CApiInputValidator.php:2143 +#: include/classes/validators/CApiInputValidator.php:2165 #: include/classes/validators/CApiInputValidator.php:2185 -#: include/classes/validators/CApiInputValidator.php:2190 -#: include/classes/validators/CApiInputValidator.php:2226 -#: include/classes/validators/CApiInputValidator.php:2233 -#: include/classes/validators/CApiInputValidator.php:2258 +#: include/classes/validators/CApiInputValidator.php:2215 +#: include/classes/validators/CApiInputValidator.php:2220 +#: include/classes/validators/CApiInputValidator.php:2256 #: include/classes/validators/CApiInputValidator.php:2263 -#: include/classes/validators/CApiInputValidator.php:2269 +#: include/classes/validators/CApiInputValidator.php:2288 +#: include/classes/validators/CApiInputValidator.php:2293 +#: include/classes/validators/CApiInputValidator.php:2299 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:490 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:506 @@ -9980,6 +9942,14 @@ msgstr "Ошибочный код ответа \"%1$s\"." #: include/classes/import/validators/C54XmlValidator.php:2561 #: include/classes/import/validators/C54XmlValidator.php:2594 #: include/classes/import/validators/C54XmlValidator.php:2600 +#: include/classes/import/validators/C60XmlValidator.php:2042 +#: include/classes/import/validators/C60XmlValidator.php:2272 +#: include/classes/import/validators/C60XmlValidator.php:2457 +#: include/classes/import/validators/C60XmlValidator.php:2477 +#: include/classes/import/validators/C60XmlValidator.php:2501 +#: include/classes/import/validators/C60XmlValidator.php:2562 +#: include/classes/import/validators/C60XmlValidator.php:2595 +#: include/classes/import/validators/C60XmlValidator.php:2601 #: include/classes/import/validators/CXmlValidatorGeneral.php:163 #: include/classes/import/validators/CXmlValidatorGeneral.php:182 #: include/classes/import/validators/CXmlValidatorGeneral.php:201 @@ -9992,7 +9962,7 @@ msgstr "Ошибочный код ответа \"%1$s\"." msgid "Invalid tag \"%1$s\": %2$s." msgstr "Ошибочный тег \"%1$s\": %2$s." -#: include/classes/validators/CActionCondValidator.php:102 +#: include/classes/validators/CActionCondValidator.php:103 msgid "Invalid time period." msgstr "Ошибочный период времени." @@ -10011,7 +9981,7 @@ msgstr "Ошибочное значение макроса \"%1$s\": %2$s." #: include/classes/helpers/CMenuHelper.php:103 #: include/classes/helpers/CRoleHelper.php:350 #: include/views/configuration.host.edit.php:446 -#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:350 +#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348 msgid "Inventory" msgstr "Инвентаризация" @@ -10029,7 +9999,7 @@ msgstr "Поле инвентарных данных" msgid "Inventory mode" msgstr "Режим инвентарных данных" -#: app/views/administration.user.list.php:111 +#: app/views/administration.user.list.php:112 msgid "Is online?" msgstr "В системе?" @@ -10063,7 +10033,7 @@ msgstr "Итальянский (it_IT)" msgid "Item" msgstr "Элемент данных" -#: include/classes/api/services/CHostPrototype.php:1199 +#: include/classes/api/services/CHostPrototype.php:1204 #: include/classes/api/services/CItem.php:61 #, c-format msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template." @@ -10094,7 +10064,7 @@ msgstr "Элемент данных \"%1$s\" не существует или у msgid "Item added" msgstr "Элемент данных добавлен" -#: app/views/popup.itemtestedit.view.php:419 +#: app/views/popup.itemtestedit.view.php:421 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually." msgstr "Элемент данных содержит пользовательский макрос со скрытыми значениями. Значения таких макросов необходимо ввести вручную." @@ -10105,7 +10075,7 @@ msgstr[0] "Элемент даных скопирован" msgstr[1] "Элементы даных скопированы" msgstr[2] "Элементы даных скопированы" -#: app/views/administration.proxy.list.php:78 +#: app/views/administration.proxy.list.php:79 msgid "Item count" msgstr "Количество элементов данных" @@ -10127,7 +10097,7 @@ msgstr[0] "Элемент данных активирован" msgstr[1] "Элементы данных активированы" msgstr[2] "Элементы данных активированы" -#: include/actions.inc.php:1210 +#: include/actions.inc.php:1265 msgid "Item in \"not supported\" state" msgstr "Элемент данных в \"неподдерживаемом\" состоянии" @@ -10187,7 +10157,7 @@ msgstr "Прототип элементов данных с ID \"%1$s\" недо #: app/controllers/CControllerPopupGeneric.php:288 #: app/controllers/CControllerPopupImportCompare.php:172 #: include/html.inc.php:440 -#: include/views/configuration.host.discovery.list.php:281 +#: include/views/configuration.host.discovery.list.php:282 #: include/views/configuration.item.prototype.edit.php:26 #: include/views/configuration.item.prototype.list.php:27 msgid "Item prototypes" @@ -10205,7 +10175,7 @@ msgstr "Прототипы элементов данных обновлены" msgid "Item tags" msgstr "Теги элемента данных" -#: jsLoader.php:372 +#: jsLoader.php:370 msgid "Item type does not use interface" msgstr "Тип элемента данных не использует интерфейс" @@ -10281,7 +10251,7 @@ msgstr "Элемент данных с ключом \"%1$s\" уже сущест #: app/views/search.php:122 app/views/search.php:298 app/views/search.php:303 #: include/classes/widgets/forms/CWidgetFormPlainText.php:31 #: include/html.inc.php:326 include/views/configuration.graph.edit.php:463 -#: include/views/configuration.host.discovery.list.php:193 +#: include/views/configuration.host.discovery.list.php:194 #: include/views/configuration.host.list.php:149 #: include/views/configuration.host.list.php:369 #: include/views/configuration.item.edit.php:26 @@ -10366,7 +10336,7 @@ msgstr "JSONPath" msgid "Jan" msgstr "Янв" -#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:223 +#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221 msgid "January" msgstr "Январь" @@ -10388,7 +10358,7 @@ msgstr "JavaScript" msgid "Jul" msgstr "Июл" -#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:229 +#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227 msgid "July" msgstr "Июль" @@ -10396,12 +10366,12 @@ msgstr "Июль" msgid "Jun" msgstr "Июн" -#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:228 +#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226 msgid "June" msgstr "Июнь" #: include/views/configuration.host.discovery.edit.php:632 -#: include/views/configuration.host.discovery.list.php:142 +#: include/views/configuration.host.discovery.list.php:143 msgid "Keep lost resources period" msgstr "Период сохранения потерянных ресурсов" @@ -10416,8 +10386,8 @@ msgstr "Kerberos" #: app/views/popup.discovery.check.php:62 disc_prototypes.php:48 #: host_discovery.php:52 #: include/views/configuration.host.discovery.edit.php:73 -#: include/views/configuration.host.discovery.list.php:102 -#: include/views/configuration.host.discovery.list.php:197 +#: include/views/configuration.host.discovery.list.php:103 +#: include/views/configuration.host.discovery.list.php:198 #: include/views/configuration.item.edit.php:116 #: include/views/configuration.item.list.php:87 #: include/views/configuration.item.prototype.edit.php:98 @@ -10467,7 +10437,7 @@ msgstr "Успешный вход через LDAP" msgid "LDAP settings" msgstr "Настройки LDAP" -#: app/views/popup.itemtestedit.view.php:298 +#: app/views/popup.itemtestedit.view.php:300 msgid "LF" msgstr "LF" @@ -10558,22 +10528,6 @@ msgstr[0] "Последний %1$d год" msgstr[1] "Последние %1$d года" msgstr[2] "Последний %1$d лет" -#: srv_status.php:42 -msgid "Last 24 hours" -msgstr "Последние 24 часа" - -#: srv_status.php:44 -msgid "Last 30 days" -msgstr "Последние 30 дней" - -#: srv_status.php:45 -msgid "Last 365 days" -msgstr "Последние 365 дней" - -#: srv_status.php:43 -msgid "Last 7 days" -msgstr "Последние 7 дней" - #: app/views/administration.token.list.php:144 #: app/views/administration.user.token.list.php:99 msgid "Last accessed at" @@ -10585,11 +10539,11 @@ msgstr "Время последнего использования" msgid "Last check" msgstr "Последняя проверка" -#: jsLoader.php:353 +#: jsLoader.php:351 msgid "Last hour graph" msgstr "График за последний час" -#: jsLoader.php:354 +#: jsLoader.php:352 msgid "Last month graph" msgstr "График за последний месяц" @@ -10606,7 +10560,7 @@ msgstr "График за последний месяц" msgid "Last of" msgstr "За последние" -#: app/views/administration.proxy.list.php:76 +#: app/views/administration.proxy.list.php:77 msgid "Last seen (age)" msgstr "Последний раз был доступен (возраст)" @@ -10619,7 +10573,7 @@ msgstr "Последняя отправка" msgid "Last value" msgstr "Последнее значение" -#: jsLoader.php:355 +#: jsLoader.php:353 msgid "Last week graph" msgstr "График за последнюю неделю" @@ -10632,11 +10586,11 @@ msgstr "График за последнюю неделю" #: include/classes/helpers/CMenuHelper.php:61 #: include/classes/helpers/CRoleHelper.php:383 #: include/views/inventory.host.view.php:143 -#: include/views/inventory.host.view.php:149 jsLoader.php:351 +#: include/views/inventory.host.view.php:149 jsLoader.php:349 msgid "Latest data" msgstr "Последние данные" -#: jsLoader.php:352 +#: jsLoader.php:350 msgid "Latest values" msgstr "Последние значения" @@ -10753,11 +10707,11 @@ msgstr "Поле связи selementid2 указывает на не сущес msgid "Link templates" msgstr "Присоединить шаблоны" -#: include/actions.inc.php:988 +#: include/actions.inc.php:1035 msgid "Link to template" msgstr "Присоединить к шаблону" -#: include/actions.inc.php:704 +#: include/actions.inc.php:736 msgid "Link to templates" msgstr "Присоединить к шаблонам" @@ -10917,7 +10871,7 @@ msgstr "Журналировать не совпадающие SNMP трапы" #: app/controllers/CControllerAuditLogList.php:166 #: app/views/administration.authentication.edit.php:132 -#: app/views/administration.user.list.php:112 include/func.inc.php:1523 +#: app/views/administration.user.list.php:113 include/func.inc.php:1523 #: include/func.inc.php:1539 index_http.php:90 index_sso.php:265 msgid "Login" msgstr "Вход в систему" @@ -10954,7 +10908,7 @@ msgstr "Ответы на выход из системы" msgid "Lost" msgstr "Потерян" -#: include/actions.inc.php:1211 +#: include/actions.inc.php:1266 msgid "Low-level discovery rule in \"not supported\" state" msgstr "Правило низкоуровневого обнаружения в \"неподдерживаемом\" состоянии" @@ -10962,12 +10916,12 @@ msgstr "Правило низкоуровневого обнаружения в msgid "M" msgstr "M" -#: jsLoader.php:242 +#: jsLoader.php:240 msgctxt "Monday short" msgid "M" msgstr "Пн" -#: include/hosts.inc.php:154 include/views/inventory.host.list.php:90 +#: include/hosts.inc.php:154 include/views/inventory.host.list.php:91 msgid "MAC address A" msgstr "MAC адрес A" @@ -11017,10 +10971,10 @@ msgstr "Макроса с hostmacroid \"%1$s\" не существует." #: app/partials/massupdate.macros.tab.php:120 #: app/views/administration.macros.edit.php:33 #: app/views/administration.macros.edit.php:100 -#: app/views/popup.itemtestedit.view.php:306 +#: app/views/popup.itemtestedit.view.php:308 #: app/views/popup.massupdate.host.php:294 #: app/views/popup.massupdate.template.php:153 -#: include/classes/helpers/CMenuHelper.php:245 include/html.inc.php:884 +#: include/classes/helpers/CMenuHelper.php:247 include/html.inc.php:884 #: include/views/configuration.host.edit.php:363 #: include/views/configuration.host.prototype.edit.php:338 #: include/views/configuration.template.edit.php:207 @@ -11034,10 +10988,10 @@ msgstr "Макросы обновлены" #: app/views/administration.user.list.php:39 #: app/views/monitoring.charts.view.php:47 #: app/views/monitoring.dashboard.view.php:75 -#: app/views/monitoring.map.view.php:45 app/views/report.services.php:73 +#: 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 "Основной фильтр" @@ -11117,14 +11071,18 @@ msgstr "Обслуживание: %1$s" msgid "Make sure to copy the auth token as you won't be able to view it after the page is closed." msgstr "Убедитесь, что скопировали токен аутентификации, так как вы не сможете просмотреть его после того, как закроете страницу." -#: include/classes/helpers/CRoleHelper.php:500 +#: include/classes/helpers/CRoleHelper.php:497 msgid "Manage API tokens" msgstr "Управление API токенами" -#: include/classes/helpers/CRoleHelper.php:504 +#: include/classes/helpers/CRoleHelper.php:502 msgid "Manage scheduled reports" msgstr "Управление регулярными отчетами" +#: include/classes/helpers/CRoleHelper.php:503 +msgid "Manage services" +msgstr "" + #: app/partials/popup.operations.php:227 #: app/views/administration.miscconfig.edit.php:61 #: app/views/popup.lldoperation.php:283 @@ -11135,18 +11093,18 @@ msgid "Manual" msgstr "Вручную" #: app/views/administration.script.edit.php:103 -#: app/views/administration.script.list.php:52 -#: app/views/administration.script.list.php:129 +#: app/views/administration.script.list.php:53 +#: app/views/administration.script.list.php:130 msgid "Manual event action" msgstr "Действие вручную над событиями" #: app/views/administration.script.edit.php:102 -#: app/views/administration.script.list.php:51 -#: app/views/administration.script.list.php:125 +#: app/views/administration.script.list.php:52 +#: app/views/administration.script.list.php:126 msgid "Manual host action" msgstr "Действие вручную над узлом сети" -#: include/actions.inc.php:1988 +#: include/actions.inc.php:2043 msgid "Manually closed" msgstr "Закрыт вручную" @@ -11156,7 +11114,7 @@ msgstr "Закрыт вручную" #: 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:256 map.php:25 +#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25 msgid "Map" msgstr "Карта сети" @@ -11257,7 +11215,7 @@ msgstr "Карты сетей" msgid "Mar" msgstr "Мрт." -#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:225 +#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223 msgid "March" msgstr "Март" @@ -11281,15 +11239,17 @@ msgstr "Маска" #: app/controllers/CControllerPopupMassupdateHost.php:487 #: app/controllers/CControllerPopupMassupdateItem.php:405 +#: app/controllers/CControllerPopupMassupdateService.php:169 #: app/controllers/CControllerPopupMassupdateTemplate.php:406 #: app/controllers/CControllerPopupMassupdateTrigger.php:234 -#: include/classes/screens/CScreenProblem.php:1142 +#: app/partials/monitoring.service.list.edit.php:139 +#: include/classes/screens/CScreenProblem.php:1143 #: include/views/configuration.host.list.php:444 -#: include/views/configuration.item.list.php:311 +#: include/views/configuration.item.list.php:309 #: include/views/configuration.item.prototype.list.php:196 #: include/views/configuration.template.list.php:278 #: include/views/configuration.trigger.prototype.list.php:202 -#: include/views/configuration.triggers.list.php:344 +#: include/views/configuration.triggers.list.php:345 msgid "Mass update" msgstr "Массовое обновление" @@ -11374,7 +11334,7 @@ msgstr[2] "Максимальный период времени отображе 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:227 +#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225 msgid "May" msgstr "Май" @@ -11456,8 +11416,8 @@ msgstr "Способ оповещения с ID \"%1$s\" недоступен." #: app/views/administration.mediatype.edit.php:31 #: app/views/administration.mediatype.list.php:31 -#: app/views/popup.import.php:45 include/classes/helpers/CMenuHelper.php:286 -#: include/classes/helpers/CRoleHelper.php:462 +#: app/views/popup.import.php:45 include/classes/helpers/CMenuHelper.php:288 +#: include/classes/helpers/CRoleHelper.php:459 msgid "Media types" msgstr "Способы оповещений" @@ -11466,8 +11426,8 @@ msgstr "Способы оповещений" msgid "Media types used by action \"%1$s\"." msgstr "Способы оповещения используются действием \"%1$s\"." -#: app/views/administration.usergroup.list.php:74 -#: include/views/configuration.hostgroups.list.php:66 +#: app/views/administration.usergroup.list.php:75 +#: include/views/configuration.hostgroups.list.php:67 msgid "Members" msgstr "Члены группы" @@ -11499,14 +11459,14 @@ msgid "Menu path" msgstr "Путь в меню" #: app/partials/popup.operations.php:160 -#: app/partials/scheduledreport.formgrid.html.php:183 +#: app/partials/scheduledreport.formgrid.html.php:182 #: app/views/monitoring.widget.actionlog.view.php:37 #: app/views/popup.acknowledge.edit.php:35 -#: app/views/popup.mediatype.message.php:80 -#: app/views/popup.mediatypetest.edit.php:75 include/actions.inc.php:1623 -#: include/actions.inc.php:1894 include/actions.inc.php:2001 -#: include/views/administration.auditacts.list.php:66 -#: include/views/administration.auditacts.list.php:97 +#: app/views/popup.mediatype.message.php:89 +#: app/views/popup.mediatypetest.edit.php:75 include/actions.inc.php:1678 +#: include/actions.inc.php:1949 include/actions.inc.php:2056 +#: include/views/administration.auditacts.list.php:67 +#: include/views/administration.auditacts.list.php:98 msgid "Message" msgstr "Сообщение" @@ -11532,12 +11492,12 @@ msgstr "Время отображения сообщения" msgid "Message type" msgstr "Тип сообщения" -#: include/actions.inc.php:1756 include/actions.inc.php:1839 +#: include/actions.inc.php:1811 include/actions.inc.php:1894 msgid "Message/Command" msgstr "Сообщение/Команда" #: app/views/administration.authentication.edit.php:201 -#: include/classes/screens/CScreenProblem.php:1224 +#: include/classes/screens/CScreenProblem.php:1225 msgid "Messages" msgstr "Сообщения" @@ -11600,7 +11560,7 @@ msgstr "Минимально требуемый лимит времени раз msgid "Minimum required size of PHP post is %1$s (configuration option \"post_max_size\")." msgstr "Минимально требуемый размер PHP post - %1$s (\"post_max_size\" параметр конфигурации)." -#: app/partials/common.filter.trigger.php:102 +#: app/partials/common.filter.trigger.php:103 #: app/views/monitoring.map.view.php:48 #: include/views/monitoring.sysmap.edit.php:267 msgid "Minimum severity" @@ -11662,8 +11622,8 @@ msgid "Missing key \"%1$s\" for host \"%2$s\"." msgstr "Отсутствует ключ \"%1$s\" для узла сети \"%2$s\"." #: app/controllers/CControllerPopupTriggerExpr.php:222 -#: app/views/administration.proxy.list.php:47 -#: app/views/administration.proxy.list.php:73 report2.php:201 +#: app/views/administration.proxy.list.php:48 +#: app/views/administration.proxy.list.php:74 report2.php:201 msgid "Mode" msgstr "Режим" @@ -11727,7 +11687,7 @@ msgstr "Класс module.php должен расширять %1$s для мод #: app/controllers/CControllerModuleList.php:122 #: app/views/administration.module.edit.php:23 #: app/views/administration.module.list.php:27 -#: include/classes/helpers/CMenuHelper.php:249 include/html.inc.php:886 +#: include/classes/helpers/CMenuHelper.php:251 include/html.inc.php:886 msgid "Modules" msgstr "Модули" @@ -11739,7 +11699,7 @@ msgstr "Модули обновлены" msgid "Mon" msgstr "Пн" -#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:235 +#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233 msgid "Monday" msgstr "Понедельник" @@ -11768,23 +11728,22 @@ msgstr "Мониторинг" msgid "Monospace" msgstr "Моноширинный" -#: app/views/popup.maintenance.period.php:104 app/views/report.services.php:81 -#: report4.php:163 +#: app/views/popup.maintenance.period.php:104 report4.php:163 msgid "Month" msgstr "Месяц" #: app/partials/scheduledreport.formgrid.html.php:104 #: app/partials/scheduledreport.table.html.php:51 -#: app/views/popup.maintenance.period.php:78 app/views/report.services.php:46 -#: include/maintenances.inc.php:31 report4.php:90 +#: app/views/popup.maintenance.period.php:78 include/maintenances.inc.php:31 +#: report4.php:90 msgid "Monthly" msgstr "Ежемесячно" -#: include/classes/html/CMultiSelect.php:83 jsLoader.php:314 +#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312 msgid "More matches found..." msgstr "Найдено больше совпадений..." -#: jsLoader.php:324 +#: jsLoader.php:322 #, c-format msgctxt "screen reader" msgid "More than %1$d matches for %2$s found" @@ -11813,11 +11772,11 @@ msgstr "Множественный" msgid "Multiple PROBLEM events" msgstr "Множественные события ПРОБЛЕМА" -#: jsLoader.php:284 +#: jsLoader.php:282 msgid "Mute" msgstr "Отключить звук" -#: app/views/monitoring.dashboard.list.php:93 +#: app/views/monitoring.dashboard.list.php:94 msgid "My" msgstr "Моя" @@ -11857,13 +11816,17 @@ msgstr "NTLM" #: app/controllers/CControllerRegExCreate.php:78 #: app/controllers/CControllerRegExDelete.php:64 #: app/controllers/CControllerRegExUpdate.php:87 -#: app/partials/common.filter.trigger.php:99 +#: app/partials/common.filter.trigger.php:100 #: app/partials/configuration.filter.items.php:91 #: app/partials/configuration.tags.tab.php:39 #: app/partials/configuration.valuemap.php:29 #: app/partials/monitoring.host.filter.php:78 #: app/partials/monitoring.host.view.html.php:29 #: app/partials/monitoring.latest.view.html.php:41 +#: app/partials/monitoring.service.list.edit.php:41 +#: app/partials/monitoring.service.list.edit.php:49 +#: app/partials/monitoring.service.list.php:35 +#: app/partials/monitoring.service.list.php:45 #: app/partials/popup.operations.php:257 #: app/partials/scheduledreport.formgrid.html.php:73 #: app/partials/scheduledreport.table.html.php:34 @@ -11873,83 +11836,88 @@ msgstr "NTLM" #: app/views/administration.image.edit.php:45 #: app/views/administration.mediatype.edit.php:50 #: app/views/administration.mediatype.edit.php:154 -#: app/views/administration.mediatype.list.php:47 -#: app/views/administration.mediatype.list.php:77 +#: app/views/administration.mediatype.list.php:48 +#: app/views/administration.mediatype.list.php:78 #: app/views/administration.module.edit.php:38 -#: app/views/administration.module.list.php:44 -#: app/views/administration.module.list.php:69 -#: app/views/administration.proxy.list.php:42 -#: app/views/administration.proxy.list.php:68 +#: app/views/administration.module.list.php:45 +#: app/views/administration.module.list.php:70 +#: app/views/administration.proxy.list.php:43 +#: app/views/administration.proxy.list.php:69 #: app/views/administration.queue.details.php:48 #: app/views/administration.regex.edit.php:105 #: app/views/administration.regex.list.php:50 #: app/views/administration.script.edit.php:64 #: app/views/administration.script.edit.php:93 -#: app/views/administration.script.list.php:42 -#: app/views/administration.script.list.php:73 +#: app/views/administration.script.list.php:43 +#: app/views/administration.script.list.php:74 #: app/views/administration.token.edit.php:45 #: app/views/administration.token.list.php:40 #: app/views/administration.token.list.php:123 #: app/views/administration.token.view.php:36 -#: app/views/administration.usergroup.list.php:44 -#: app/views/administration.usergroup.list.php:68 -#: app/views/administration.user.list.php:67 -#: app/views/administration.userrole.edit.php:43 -#: app/views/administration.userrole.list.php:44 -#: app/views/administration.userrole.list.php:61 +#: app/views/administration.usergroup.list.php:45 +#: app/views/administration.usergroup.list.php:69 +#: app/views/administration.user.list.php:68 +#: app/views/administration.userrole.edit.php:42 +#: app/views/administration.userrole.list.php:45 +#: app/views/administration.userrole.list.php:62 #: app/views/administration.user.token.edit.php:45 #: app/views/administration.user.token.list.php:39 #: app/views/administration.user.token.list.php:88 #: app/views/administration.user.token.view.php:36 #: app/views/configuration.correlation.edit.php:48 #: app/views/configuration.correlation.edit.php:59 -#: app/views/configuration.correlation.list.php:47 -#: app/views/configuration.correlation.list.php:71 +#: app/views/configuration.correlation.list.php:48 +#: app/views/configuration.correlation.list.php:72 #: app/views/configuration.dashboard.list.php:42 #: app/views/configuration.discovery.edit.php:44 -#: app/views/configuration.discovery.list.php:47 -#: app/views/configuration.discovery.list.php:72 +#: app/views/configuration.discovery.list.php:48 +#: app/views/configuration.discovery.list.php:73 #: app/views/dashboard.page.properties.edit.php:36 #: app/views/dashboard.properties.edit.php:63 -#: app/views/monitoring.dashboard.list.php:59 -#: app/views/monitoring.dashboard.list.php:83 -#: app/views/monitoring.latest.view.php:90 +#: app/views/monitoring.dashboard.list.php:60 +#: app/views/monitoring.dashboard.list.php:84 +#: app/views/monitoring.latest.view.php:91 +#: app/views/monitoring.service.list.edit.php:135 +#: app/views/monitoring.service.list.php:126 #: app/views/monitoring.widget.navtreeitem.edit.php:34 #: app/views/monitoring.widget.plaintext.view.php:48 #: app/views/popup.httpstep.php:45 app/views/popup.httpstep.php:70 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120 -#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:323 +#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:325 #: app/views/popup.lldoperation.php:270 app/views/popup.lldoverride.php:47 #: app/views/popup.massupdate.host.php:207 #: app/views/popup.massupdate.item.php:120 #: app/views/popup.massupdate.item.php:486 +#: app/views/popup.massupdate.service.php:50 #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:87 #: app/views/popup.massupdate.trigger.php:101 -#: 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:48 disc_prototypes.php:44 +#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:82 +#: app/views/popup.service.edit.php:183 app/views/popup.services.php:37 +#: app/views/popup.services.php:56 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 #: include/classes/widgets/CWidgetHelper.php:67 include/forms.inc.php:1214 #: include/hosts.inc.php:109 include/views/configuration.action.edit.php:48 #: include/views/configuration.action.edit.php:59 -#: include/views/configuration.action.list.php:66 -#: include/views/configuration.action.list.php:95 +#: include/views/configuration.action.list.php:68 +#: include/views/configuration.action.list.php:97 #: include/views/configuration.graph.edit.php:90 #: include/views/configuration.graph.edit.php:359 -#: include/views/configuration.graph.list.php:149 +#: include/views/configuration.graph.list.php:150 #: include/views/configuration.host.discovery.edit.php:55 #: include/views/configuration.host.discovery.edit.php:124 #: include/views/configuration.host.discovery.edit.php:167 #: include/views/configuration.host.discovery.edit.php:305 #: include/views/configuration.host.discovery.edit.php:851 -#: include/views/configuration.host.discovery.list.php:99 -#: include/views/configuration.host.discovery.list.php:192 +#: include/views/configuration.host.discovery.list.php:100 +#: include/views/configuration.host.discovery.list.php:193 #: include/views/configuration.host.edit.php:212 #: include/views/configuration.host.edit.php:246 -#: include/views/configuration.hostgroups.list.php:43 -#: include/views/configuration.hostgroups.list.php:61 +#: include/views/configuration.hostgroups.list.php:44 +#: include/views/configuration.hostgroups.list.php:62 #: include/views/configuration.host.list.php:97 #: include/views/configuration.host.list.php:148 #: include/views/configuration.host.prototype.edit.php:209 @@ -11959,7 +11927,7 @@ msgstr "NTLM" #: include/views/configuration.httpconf.edit.php:117 #: include/views/configuration.httpconf.edit.php:135 #: include/views/configuration.httpconf.edit.php:202 -#: include/views/configuration.httpconf.list.php:133 +#: include/views/configuration.httpconf.list.php:134 #: include/views/configuration.item.edit.php:76 #: include/views/configuration.item.edit.php:160 #: include/views/configuration.item.edit.php:203 @@ -11972,9 +11940,8 @@ msgstr "NTLM" #: include/views/configuration.item.prototype.edit.php:322 #: include/views/configuration.item.prototype.list.php:59 #: include/views/configuration.maintenance.edit.php:94 -#: include/views/configuration.maintenance.list.php:59 -#: include/views/configuration.maintenance.list.php:84 -#: include/views/configuration.services.edit.php:48 +#: include/views/configuration.maintenance.list.php:60 +#: include/views/configuration.maintenance.list.php:85 #: include/views/configuration.template.edit.php:127 #: include/views/configuration.template.list.php:80 #: include/views/configuration.template.list.php:114 @@ -11984,23 +11951,22 @@ msgstr "NTLM" #: include/views/configuration.triggers.edit.php:92 #: include/views/configuration.triggers.edit.php:590 #: include/views/configuration.triggers.list.php:67 -#: include/views/configuration.triggers.list.php:191 -#: include/views/inventory.host.list.php:85 +#: include/views/configuration.triggers.list.php:192 +#: include/views/inventory.host.list.php:86 #: include/views/js/monitoring.sysmaps.js.php:173 #: include/views/js/monitoring.sysmaps.js.php:314 #: include/views/js/monitoring.sysmaps.js.php:637 #: include/views/monitoring.sysmap.edit.php:93 #: include/views/monitoring.sysmap.edit.php:278 -#: include/views/monitoring.sysmap.list.php:46 -#: include/views/monitoring.sysmap.list.php:65 items.php:48 maintenance.php:40 -#: report2.php:506 services.php:36 sysmaps.php:39 trigger_prototypes.php:38 -#: triggers.php:45 +#: include/views/monitoring.sysmap.list.php:47 +#: include/views/monitoring.sysmap.list.php:66 items.php:48 maintenance.php:40 +#: report2.php:507 sysmaps.php:39 trigger_prototypes.php:38 triggers.php:45 msgid "Name" msgstr "Имя" #: app/controllers/CControllerPopupGeneric.php:232 #: app/views/administration.user.edit.php:75 -#: app/views/administration.user.list.php:107 +#: app/views/administration.user.list.php:108 msgctxt "user first name" msgid "Name" msgstr "Имя" @@ -12017,7 +11983,7 @@ msgstr "Имя поля формы не должно превышать 255 си msgid "Namespace" msgstr "Пространство имён" -#: app/views/administration.housekeeping.edit.php:67 +#: app/views/administration.housekeeping.edit.php:76 msgid "Network discovery data storage period" msgstr "Период хранения данных о событиях сетевого обнаружения" @@ -12068,11 +12034,11 @@ msgstr "Время ожидания сети при выполнении скр msgid "Network utilization (combined transmit-rates and receive-rates) during the interval, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance" msgstr "Утилизация сети (совокупность скоростей передачи и приёма) в течении интервала, <url> - URL службы VMware, <uuid> - имя хоста виртуальной машины VMware, <экземпляр> - экземпляр сетевого интерфейса" -#: app/views/administration.proxy.list.php:157 include/func.inc.php:191 +#: app/views/administration.proxy.list.php:158 include/func.inc.php:191 msgid "Never" msgstr "Никогда" -#: app/controllers/CControllerPopupConditionActions.php:93 +#: app/controllers/CControllerPopupConditionActions.php:94 #: app/controllers/CControllerPopupConditionEventCorr.php:87 #: app/controllers/CControllerPopupConditionOperations.php:68 msgid "New condition" @@ -12083,7 +12049,7 @@ msgstr "Новое условие" msgid "New dashboard" msgstr "Новая панель" -#: jsLoader.php:270 +#: jsLoader.php:268 msgid "New element" msgstr "Новый элемент" @@ -12107,7 +12073,11 @@ msgstr "Новая операция" msgid "New regular expression" msgstr "Новое регулярное выражение" -#: include/views/configuration.services.edit.php:337 +#: app/controllers/CControllerPopupServiceEdit.php:134 +msgid "New service" +msgstr "" + +#: app/controllers/CControllerPopupServiceTimeEdit.php:120 msgid "New service time" msgstr "Новый интервал времени услуги" @@ -12119,7 +12089,7 @@ msgstr "Имя нового тега" msgid "New triggers" msgstr "Новые триггера" -#: jsLoader.php:183 +#: jsLoader.php:181 msgid "Next page" msgstr "Следующая страница" @@ -12132,12 +12102,12 @@ msgstr "Далее" #: app/partials/configuration.filter.items.php:195 #: app/partials/configuration.filter.items.php:202 #: app/partials/configuration.filter.items.php:211 -#: app/views/administration.user.list.php:135 -#: app/views/administration.user.list.php:139 app/views/hint.box.php:179 +#: app/views/administration.user.list.php:136 +#: app/views/administration.user.list.php:140 app/views/hint.box.php:179 #: app/views/hint.box.php:183 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:647 +#: app/views/popup.condition.common.php:682 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97 #: app/views/popup.massupdate.item.php:328 #: app/views/popup.massupdate.item.php:337 @@ -12145,16 +12115,16 @@ msgstr "Далее" #: app/views/popup.massupdate.trigger.php:67 include/actions.inc.php:33 #: include/blocks.inc.php:537 include/blocks.inc.php:615 #: include/blocks.inc.php:844 include/blocks.inc.php:848 -#: include/classes/screens/CScreenProblem.php:1106 -#: include/classes/screens/CScreenProblem.php:1110 -#: include/classes/screens/CScreenProblem.php:1252 include/events.inc.php:195 -#: include/events.inc.php:199 include/events.inc.php:394 -#: include/events.inc.php:398 include/triggers.inc.php:1173 +#: include/classes/screens/CScreenProblem.php:1107 +#: include/classes/screens/CScreenProblem.php:1111 +#: include/classes/screens/CScreenProblem.php:1253 include/events.inc.php:198 +#: include/events.inc.php:202 include/events.inc.php:397 +#: include/events.inc.php:401 include/triggers.inc.php:1173 #: include/triggers.inc.php:1178 -#: include/views/configuration.graph.list.php:205 +#: include/views/configuration.graph.list.php:206 #: include/views/configuration.host.prototype.list.php:142 #: include/views/configuration.host.prototype.list.php:158 -#: include/views/configuration.httpconf.list.php:187 +#: include/views/configuration.httpconf.list.php:188 #: include/views/configuration.item.prototype.list.php:117 #: include/views/configuration.item.prototype.list.php:153 #: include/views/configuration.trigger.prototype.list.php:131 @@ -12210,9 +12180,9 @@ msgstr "Не указан \"%1$s\" у карты сети." msgid "No \"%1$s\" given for media type." msgstr "Не указан \"%1$s\" у типа оповещений." -#: include/classes/api/services/CAction.php:2640 -#: include/classes/api/services/CAction.php:2764 -#: include/classes/api/services/CAction.php:2957 +#: include/classes/api/services/CAction.php:2655 +#: include/classes/api/services/CAction.php:2781 +#: include/classes/api/services/CAction.php:2975 #, c-format msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"." msgstr "Не указано \"%2$s\" для условия фильтра действия \"%1$s\"." @@ -12222,7 +12192,7 @@ msgstr "Не указано \"%2$s\" для условия фильтра дей msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"." msgstr "Не указано \"%2$s\" для условия фильтра правила обнаружения \"%1$s\"." -#: include/classes/api/services/CAction.php:2601 +#: include/classes/api/services/CAction.php:2616 #, c-format msgid "No \"%2$s\" given for the filter of action \"%1$s\"." msgstr "Не указан \"%2$s\" для фильтра в действии \"%1$s\"." @@ -12255,7 +12225,7 @@ msgid "No conditions defined." msgstr "Условия не заданы." #: include/views/configuration.maintenance.edit.php:105 -#: include/views/configuration.maintenance.list.php:110 +#: include/views/configuration.maintenance.list.php:111 msgid "No data collection" msgstr "Без сбора данных" @@ -12269,7 +12239,7 @@ msgid "No data." msgstr "Данные отсутствуют." #: include/classes/api/services/CHostInterface.php:1023 -#: include/classes/api/services/CHostPrototype.php:1765 +#: include/classes/api/services/CHostPrototype.php:1770 #, c-format msgid "No default interface for \"%1$s\" type on \"%2$s\"." msgstr "Нет интерфейса по умолчанию для \"%1$s\" типа у \"%2$s\"." @@ -12284,7 +12254,7 @@ msgid "No discovery rule IDs given." msgstr "ID правил обнаружения не указаны." #: app/views/administration.user.edit.php:433 -#: app/views/administration.userrole.edit.php:167 +#: app/views/administration.userrole.edit.php:162 msgid "No enabled modules found." msgstr "Активированные модули не найдены." @@ -12350,7 +12320,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:371 +#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369 msgid "No interface found" msgstr "Интерфейс не найден" @@ -12368,7 +12338,7 @@ msgstr "Не указан интерфейс для прокси \"%1$s\"." msgid "No interfaces are defined." msgstr "Интерфейсы не заданы." -#: include/classes/api/services/CAction.php:1831 +#: include/classes/api/services/CAction.php:1851 msgid "No inventory mode specified for action operation." msgstr "Не указан режим инвентарных данных для операции действия." @@ -12390,7 +12360,7 @@ msgstr "Макросы не найдены." msgid "No maps added." msgstr "Карты сети не добавлены." -#: include/classes/html/CMultiSelect.php:82 jsLoader.php:313 +#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311 msgid "No matches found" msgstr "Совпадения не найдены" @@ -12431,6 +12401,7 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: app/controllers/CControllerPopupMediatypeTestEdit.php:56 #: app/controllers/CControllerPopupMediatypeTestSend.php:73 #: app/controllers/CControllerPopupScriptExec.php:120 +#: app/controllers/CControllerServiceListGeneral.php:46 #: app/controllers/CControllerUserUpdateGeneral.php:134 #: app/controllers/CControllerWidgetClockView.php:109 #: app/controllers/CControllerWidgetDiscoveryView.php:64 @@ -12439,9 +12410,9 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: app/controllers/CControllerWidgetPlainTextView.php:88 #: app/views/monitoring.widget.graph.view.php:42 disc_prototypes.php:750 #: host_discovery.php:795 hostinventoriesoverview.php:74 -#: include/classes/api/services/CAction.php:1571 -#: include/classes/api/services/CAction.php:1843 -#: include/classes/api/services/CAction.php:2855 +#: include/classes/api/services/CAction.php:1582 +#: include/classes/api/services/CAction.php:1863 +#: include/classes/api/services/CAction.php:2872 #: include/classes/api/services/CAuthentication.php:181 #: include/classes/api/services/CAutoregistration.php:135 #: include/classes/api/services/CConfiguration.php:78 @@ -12462,9 +12433,9 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CDRule.php:316 #: include/classes/api/services/CDRule.php:343 #: include/classes/api/services/CDRule.php:831 -#: include/classes/api/services/CEvent.php:802 -#: include/classes/api/services/CEvent.php:841 -#: include/classes/api/services/CEvent.php:866 +#: include/classes/api/services/CEvent.php:803 +#: include/classes/api/services/CEvent.php:842 +#: include/classes/api/services/CEvent.php:867 #: include/classes/api/services/CGraphGeneral.php:71 #: include/classes/api/services/CGraphGeneral.php:93 #: include/classes/api/services/CGraph.php:559 @@ -12493,10 +12464,10 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: include/classes/api/services/CHostPrototype.php:549 #: include/classes/api/services/CHostPrototype.php:595 #: include/classes/api/services/CHostPrototype.php:616 -#: include/classes/api/services/CHostPrototype.php:1224 -#: include/classes/api/services/CHostPrototype.php:1246 -#: include/classes/api/services/CHostPrototype.php:1280 -#: include/classes/api/services/CHousekeeping.php:169 +#: include/classes/api/services/CHostPrototype.php:1229 +#: include/classes/api/services/CHostPrototype.php:1251 +#: include/classes/api/services/CHostPrototype.php:1285 +#: include/classes/api/services/CHousekeeping.php:171 #: include/classes/api/services/CHttpTest.php:505 #: include/classes/api/services/CHttpTest.php:597 #: include/classes/api/services/CHttpTest.php:684 @@ -12543,8 +12514,10 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: 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:1017 -#: include/classes/api/services/CService.php:1043 +#: include/classes/api/services/CService.php:316 +#: include/classes/api/services/CService.php:348 +#: include/classes/api/services/CService.php:677 +#: include/classes/api/services/CService.php:716 #: include/classes/api/services/CSettings.php:264 #: include/classes/api/services/CTask.php:430 #: include/classes/api/services/CTask.php:477 @@ -12575,7 +12548,7 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"." #: 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 services.php:84 +#: include/func.inc.php:1488 items.php:1240 msgid "No permissions to referred object or it does not exist!" msgstr "Нет прав доступа к запрашиваемому объекту или он не существует!" @@ -12591,15 +12564,15 @@ msgstr "Без прокси" msgid "No public key file specified." msgstr "Файл публичного ключа не указан." -#: include/classes/api/services/CAction.php:1720 +#: include/classes/api/services/CAction.php:1736 msgid "No recipients for action operation message." msgstr "Нет получателей сообщения в операции действия." -#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:178 +#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176 msgid "No refresh" msgstr "Не обновлять" -#: include/classes/api/services/CAction.php:1745 +#: include/classes/api/services/CAction.php:1761 msgid "No script specified for action operation command." msgstr "Не указан скрипт для команды в операции действия." @@ -12624,7 +12597,7 @@ msgstr "Триггеры не заданы." msgid "No value" msgstr "Значение отсутствует" -#: include/classes/validators/CApiInputValidator.php:929 +#: include/classes/validators/CApiInputValidator.php:959 msgid "Non-boolean flags are deprecated." msgstr "Не-логические флаги устарели." @@ -12634,8 +12607,8 @@ msgstr "Не-логические флаги устарели." #: app/partials/monitoring.problem.filter.php:242 #: app/views/administration.mediatype.edit.php:82 #: app/views/administration.mediatype.edit.php:91 -#: app/views/administration.proxy.list.php:123 -#: app/views/administration.proxy.list.php:136 +#: app/views/administration.proxy.list.php:124 +#: app/views/administration.proxy.list.php:137 #: app/views/administration.usergroup.edit.php:135 #: include/classes/widgets/CWidgetHelper.php:751 #: include/classes/widgets/CWidgetHelper.php:826 @@ -12659,7 +12632,7 @@ msgstr "Нет" #: app/partials/configuration.filter.items.php:177 #: app/views/popup.generic.php:520 include/graphs.inc.php:24 #: include/items.inc.php:156 include/triggers.inc.php:1166 -#: include/views/configuration.host.discovery.list.php:156 +#: include/views/configuration.host.discovery.list.php:157 #: include/views/configuration.triggers.list.php:76 #: include/views/monitoring.history.php:256 msgid "Normal" @@ -12673,7 +12646,7 @@ msgstr "Нормальный вид" msgid "Norwegian (nb_NO)" msgstr "Норвежский (nb_NO)" -#: include/actions.inc.php:153 +#: include/actions.inc.php:161 msgid "Not Ack" msgstr "Не подтверждено" @@ -12724,15 +12697,14 @@ msgid "Not inherited items" msgstr "Без унаследованных элементов данных" #: app/partials/configuration.filter.items.php:178 -#: app/views/popup.itemtestedit.view.php:278 include/items.inc.php:157 +#: app/views/popup.itemtestedit.view.php:280 include/items.inc.php:157 #: include/items.inc.php:182 -#: include/views/configuration.host.discovery.list.php:157 +#: include/views/configuration.host.discovery.list.php:158 msgid "Not supported" msgstr "Не поддерживается" -#: app/views/popup.services.php:71 -#: include/views/configuration.services.edit.php:180 -#: include/views/configuration.services.edit.php:253 +#: app/views/popup.service.edit.php:133 +#: app/views/popup.service.time.edit.php:117 msgid "Note" msgstr "Заметка" @@ -12753,8 +12725,8 @@ msgstr "Отчет об оповещениях" msgid "Notifications" msgstr "Оповещения" -#: include/actions.inc.php:824 include/actions.inc.php:991 -#: include/actions.inc.php:992 +#: include/actions.inc.php:865 include/actions.inc.php:1038 +#: include/actions.inc.php:1039 msgid "Notify all involved" msgstr "Оповещать всех участников" @@ -12762,7 +12734,7 @@ msgstr "Оповещать всех участников" msgid "Nov" msgstr "Нбр." -#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:233 +#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231 msgid "November" msgstr "Ноябрь" @@ -12843,7 +12815,7 @@ msgid "Number of status changes" msgstr "Количество изменений состояния" #: include/classes/screens/CScreenHttpTest.php:114 -#: include/views/configuration.httpconf.list.php:134 +#: include/views/configuration.httpconf.list.php:135 msgid "Number of steps" msgstr "Количество шагов" @@ -12940,12 +12912,17 @@ msgstr "Числовой (целое положительное)" msgid "OEM" msgstr "OEM" +#: app/partials/monitoring.service.list.edit.php:112 +#: app/partials/monitoring.service.list.php:108 #: app/views/js/popup.import.js.php:50 app/views/js/popup.import.js.php:149 -#: app/views/js/reports.scheduledreport.edit.js.php:77 chart4.php:164 -#: chart5.php:195 include/classes/screens/CScreenHttpTestDetails.php:100 +#: app/views/js/reports.scheduledreport.edit.js.php:77 +#: app/views/monitoring.service.list.edit.php:80 +#: app/views/monitoring.service.list.edit.php:146 +#: app/views/monitoring.service.list.php:76 +#: app/views/monitoring.service.list.php:137 chart4.php:164 +#: include/classes/screens/CScreenHttpTestDetails.php:100 #: include/classes/screens/CScreenHttpTestDetails.php:186 -#: include/classes/screens/CScreenHttpTest.php:140 -#: include/classes/tree/CServiceTree.php:45 include/maps.inc.php:422 +#: include/classes/screens/CScreenHttpTest.php:140 include/maps.inc.php:422 #: include/triggers.inc.php:249 #: include/views/monitoring.overview.triggers.php:36 msgid "OK" @@ -12977,7 +12954,7 @@ msgstr "OOB маска подсети" msgid "OR" msgstr "ИЛИ" -#: include/hosts.inc.php:119 include/views/inventory.host.list.php:87 +#: include/hosts.inc.php:119 include/views/inventory.host.list.php:88 msgid "OS" msgstr "ОС" @@ -13001,27 +12978,25 @@ msgstr "Окт" msgid "Octal to decimal" msgstr "Восьмеричное в десятичное" -#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:232 +#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230 msgid "October" msgstr "Октябрь" -#: app/views/administration.proxy.list.php:155 +#: app/views/administration.proxy.list.php:156 #: include/views/monitoring.sysmap.constructor.php:51 -#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:252 +#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250 msgid "Off" msgstr "Выкл" -#: app/views/administration.user.list.php:147 +#: app/views/administration.user.list.php:148 #: 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/monitoring.widget.web.view.php:30 -#: app/views/report.services.php:80 app/views/report.services.php:81 -#: app/views/report.services.php:82 app/views/report.services.php:83 #: 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:383 -#: report2.php:506 +#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381 +#: report2.php:507 msgid "Ok" msgstr "Ok" @@ -13037,9 +13012,9 @@ msgstr "Значение тега старого события" msgid "Old tag name" msgstr "Имя старого тега" -#: app/views/administration.proxy.list.php:154 +#: app/views/administration.proxy.list.php:155 #: include/views/monitoring.sysmap.constructor.php:51 -#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:251 +#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249 msgid "On" msgstr "Вкл" @@ -13063,8 +13038,8 @@ msgstr "Один из объектов остался без группы узл msgid "One time only" msgstr "Единовременно" -#: include/views/configuration.services.edit.php:199 -#: include/views/configuration.services.edit.php:246 +#: app/partials/service.time.row.php:40 +#: app/views/popup.service.time.edit.php:47 msgid "One-time downtime" msgstr "Однократная недоступность" @@ -13137,6 +13112,14 @@ msgstr[0] "Только выбранная проблема" msgstr[1] "Только выбранные проблемы" msgstr[2] "Только выбранные проблемы" +#: app/views/monitoring.service.list.edit.php:152 +msgid "Only services without children" +msgstr "" + +#: app/views/monitoring.service.list.edit.php:160 +msgid "Only services without problem tags" +msgstr "" + #: include/classes/api/services/CCorrelation.php:519 msgid "Only super admins can create correlations." msgstr "Только супер администраторы могут создавать корреляции." @@ -13153,11 +13136,6 @@ msgstr "Только супер администраторы могут зада msgid "Only super admins can update correlations." msgstr "Только супер администраторы могут обновлять корреляции." -#: include/services.inc.php:275 -#, c-format -msgid "Only the last 20%% of the indicator is displayed." -msgstr "Индикатор отображает только последние 20%%." - #: include/blocks.inc.php:566 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted" msgstr "Подсчитываются только триггеры у активированных узлов сети и которые зависят от активных элементов данных" @@ -13171,11 +13149,11 @@ msgstr "Opera" msgid "Operating system information. Returns string" msgstr "Информация об операционной системе. Возвращает строку" -#: app/partials/popup.operations.php:41 +#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:82 msgid "Operation" msgstr "Операция" -#: actionconf.php:278 +#: actionconf.php:279 #, c-format msgid "Operation \"%1$s\" already exists." msgstr "Операция \"%1$s\" уже существует." @@ -13184,34 +13162,34 @@ msgstr "Операция \"%1$s\" уже существует." msgid "Operation cannot be performed due to unauthorized request." msgstr "Операция не может быть выполнена из-за несанкционированного запроса." -#: jsLoader.php:143 +#: jsLoader.php:141 msgid "Operation details" msgstr "Детали операции" -#: include/classes/api/services/CAction.php:1804 +#: include/classes/api/services/CAction.php:1824 msgid "Operation has no group to operate." msgstr "Операция не имеет группу для функционирования." -#: include/classes/api/services/CAction.php:1816 +#: include/classes/api/services/CAction.php:1836 msgid "Operation has no template to operate." msgstr "Операция не имеет шаблон для функционирования." #: app/views/monitoring.widget.problems.view.php:64 include/blocks.inc.php:720 #: include/classes/screens/CScreenProblem.php:898 -#: include/classes/screens/CScreenProblem.php:1167 include/events.inc.php:181 +#: include/classes/screens/CScreenProblem.php:1168 include/events.inc.php:184 #: include/views/configuration.trigger.prototype.edit.php:84 #: include/views/configuration.trigger.prototype.list.php:59 #: include/views/configuration.triggers.edit.php:106 -#: include/views/configuration.triggers.list.php:192 +#: include/views/configuration.triggers.list.php:193 msgid "Operational data" msgstr "Оперативные данные" #: app/views/configuration.correlation.edit.php:140 -#: app/views/configuration.correlation.list.php:76 +#: app/views/configuration.correlation.list.php:77 #: app/views/popup.lldoverride.php:210 -#: include/views/configuration.action.edit.php:309 -#: include/views/configuration.action.edit.php:479 -#: include/views/configuration.action.list.php:97 +#: include/views/configuration.action.edit.php:310 +#: include/views/configuration.action.edit.php:482 +#: include/views/configuration.action.list.php:99 msgid "Operations" msgstr "Операции" @@ -13219,28 +13197,29 @@ msgstr "Операции" #: app/views/popup.condition.common.php:101 #: app/views/popup.condition.common.php:120 #: app/views/popup.condition.common.php:140 -#: app/views/popup.condition.common.php:200 -#: app/views/popup.condition.common.php:212 -#: app/views/popup.condition.common.php:245 -#: app/views/popup.condition.common.php:276 -#: app/views/popup.condition.common.php:287 -#: app/views/popup.condition.common.php:301 -#: app/views/popup.condition.common.php:319 -#: app/views/popup.condition.common.php:351 -#: app/views/popup.condition.common.php:366 -#: app/views/popup.condition.common.php:381 -#: app/views/popup.condition.common.php:414 -#: app/views/popup.condition.common.php:432 -#: app/views/popup.condition.common.php:462 -#: app/views/popup.condition.common.php:482 -#: app/views/popup.condition.common.php:514 -#: app/views/popup.condition.common.php:525 -#: app/views/popup.condition.common.php:543 -#: app/views/popup.condition.common.php:558 -#: app/views/popup.condition.common.php:574 -#: app/views/popup.condition.common.php:593 -#: app/views/popup.condition.common.php:606 -#: app/views/popup.condition.common.php:651 include/hosts.inc.php:62 +#: app/views/popup.condition.common.php:208 +#: app/views/popup.condition.common.php:220 +#: app/views/popup.condition.common.php:253 +#: app/views/popup.condition.common.php:284 +#: app/views/popup.condition.common.php:295 +#: app/views/popup.condition.common.php:309 +#: app/views/popup.condition.common.php:327 +#: app/views/popup.condition.common.php:359 +#: app/views/popup.condition.common.php:374 +#: app/views/popup.condition.common.php:389 +#: app/views/popup.condition.common.php:422 +#: app/views/popup.condition.common.php:440 +#: app/views/popup.condition.common.php:470 +#: app/views/popup.condition.common.php:490 +#: app/views/popup.condition.common.php:522 +#: app/views/popup.condition.common.php:533 +#: app/views/popup.condition.common.php:551 +#: app/views/popup.condition.common.php:566 +#: app/views/popup.condition.common.php:582 +#: app/views/popup.condition.common.php:603 +#: app/views/popup.condition.common.php:616 +#: app/views/popup.condition.common.php:644 +#: app/views/popup.condition.common.php:686 include/hosts.inc.php:62 msgid "Operator" msgstr "Оператор" @@ -13324,6 +13303,7 @@ msgstr "Или" #: app/views/popup.massupdate.item.php:456 #: app/views/popup.massupdate.item.php:466 #: app/views/popup.massupdate.item.php:477 +#: app/views/popup.massupdate.service.php:40 #: app/views/popup.massupdate.template.php:47 #: app/views/popup.massupdate.template.php:75 #: app/views/popup.massupdate.template.php:119 @@ -13335,7 +13315,7 @@ msgstr "Или" msgid "Original" msgstr "Оригинальное" -#: include/classes/helpers/CMenuHelper.php:257 include/html.inc.php:888 +#: include/classes/helpers/CMenuHelper.php:259 include/html.inc.php:888 msgid "Other" msgstr "Прочие" @@ -13377,11 +13357,11 @@ msgstr "Переопределено" msgid "Override" msgstr "Замещение" -#: app/views/administration.housekeeping.edit.php:131 +#: app/views/administration.housekeeping.edit.php:140 msgid "Override item history period" msgstr "Переопределить период хранения истории элементов данных" -#: app/views/administration.housekeeping.edit.php:148 +#: app/views/administration.housekeeping.edit.php:157 msgid "Override item trend period" msgstr "Переопределить период хранения динамики изменения элементов данных" @@ -13579,10 +13559,10 @@ msgid "POP" msgstr "POP" #: app/views/hint.box.php:117 -#: app/views/monitoring.widget.problems.view.php:109 chart5.php:199 +#: app/views/monitoring.widget.problems.view.php:109 #: include/classes/graph/CSvgGraph.php:1075 #: include/classes/screens/CScreenProblem.php:982 -#: include/classes/screens/CScreenProblem.php:1192 include/events.inc.php:378 +#: include/classes/screens/CScreenProblem.php:1193 include/events.inc.php:381 #: include/triggers.inc.php:250 include/views/monitoring.overview.items.php:36 #: include/views/monitoring.overview.triggers.php:45 msgid "PROBLEM" @@ -13600,8 +13580,8 @@ msgstr "Режим генерации событий ПРОБЛЕМА" #: app/views/administration.proxy.edit.php:109 #: app/views/administration.proxy.edit.php:120 #: app/views/administration.proxy.edit.php:130 -#: app/views/administration.proxy.list.php:126 -#: app/views/administration.proxy.list.php:139 +#: app/views/administration.proxy.list.php:127 +#: app/views/administration.proxy.list.php:140 #: app/views/popup.massupdate.host.php:238 #: app/views/popup.massupdate.host.php:251 #: app/views/popup.massupdate.host.php:266 @@ -13630,7 +13610,7 @@ msgstr "Идентификатор PSK" msgid "PSK is too short. Minimum is %1$s hex-digits." msgstr "PSK слишком короткий. Минимально %1$s шестнадцатеричных цифр." -#: jsLoader.php:156 +#: jsLoader.php:154 #, c-format msgid "Page %1$d" msgstr "Страница %1$d" @@ -13660,7 +13640,7 @@ msgstr "Параметр" #: include/classes/api/services/CUser.php:485 #: include/classes/api/services/CUser.php:532 #: include/classes/api/services/CUser.php:1417 -#: include/classes/validators/CApiInputValidator.php:989 +#: include/classes/validators/CApiInputValidator.php:1019 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "Параметр \"%1$s\" устарел." @@ -13688,9 +13668,13 @@ msgstr "Родительские графики" msgid "Parent items" msgstr "Родительские элементы данных" -#: include/views/configuration.services.edit.php:62 -msgid "Parent service" -msgstr "Родительская услуга IT" +#: app/partials/monitoring.service.list.edit.php:40 +#: app/partials/monitoring.service.list.php:34 +#: app/views/monitoring.service.list.edit.php:108 +#: app/views/monitoring.service.list.php:99 +#: app/views/popup.service.edit.php:57 +msgid "Parent services" +msgstr "" #: app/partials/configuration.tags.tab.php:42 msgid "Parent templates" @@ -13722,8 +13706,8 @@ msgid "Parse error" msgstr "Ошибка разбора" #: app/views/administration.proxy.edit.php:78 -#: app/views/administration.proxy.list.php:51 -#: app/views/administration.proxy.list.php:151 +#: app/views/administration.proxy.list.php:52 +#: app/views/administration.proxy.list.php:152 msgid "Passive" msgstr "Пассивный" @@ -13763,24 +13747,24 @@ msgstr "Пароль (подтверждение)" msgid "Password is not mandatory for non internal authentication type." msgstr "Пароль не обязателен при не внутреннем типе аутентификации." -#: jsLoader.php:179 jsLoader.php:272 +#: jsLoader.php:177 jsLoader.php:270 msgid "Paste" msgstr "Вставить" -#: jsLoader.php:157 +#: jsLoader.php:155 msgid "Paste widget" msgstr "Вставить виджет" -#: jsLoader.php:273 +#: jsLoader.php:271 msgid "Paste without external links" msgstr "Вставить без внешних связей" #: app/controllers/CControllerPopupTriggerExpr.php:829 -#: app/views/monitoring.charts.view.php:106 +#: app/views/monitoring.charts.view.php:107 msgid "Pattern" msgstr "Шаблон" -#: actionconf.php:83 include/views/configuration.action.edit.php:163 +#: actionconf.php:84 include/views/configuration.action.edit.php:163 msgid "Pause operations for suppressed problems" msgstr "Приостановить операции для подавленных проблем" @@ -13822,12 +13806,10 @@ msgstr "Выполнение DNS запроса. Возвращает строк #: app/partials/scheduledreport.table.html.php:42 #: app/views/popup.lldoperation.php:116 #: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180 -#: app/views/report.services.php:38 #: include/views/configuration.host.discovery.edit.php:584 #: 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 "Период" @@ -13836,8 +13818,8 @@ msgid "Period shift" msgstr "Сдвиг периода" #: app/views/popup.maintenance.period.php:69 +#: app/views/popup.service.time.edit.php:39 #: include/views/configuration.maintenance.edit.php:45 -#: include/views/configuration.services.edit.php:238 msgid "Period type" msgstr "Тип периода" @@ -13915,7 +13897,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:261 +#: jsLoader.php:259 msgid "Please select two elements" msgstr "Пожалуйста, выберите два элемента" @@ -13954,7 +13936,7 @@ msgstr "Заполнение поля инвентаря узла сети" #: app/views/administration.authentication.edit.php:101 #: app/views/administration.proxy.edit.php:54 #: app/views/administration.script.edit.php:163 -#: app/views/popup.itemtestedit.view.php:111 +#: app/views/popup.itemtestedit.view.php:113 #: include/classes/setup/CSetupWizard.php:444 include/hosts.inc.php:1307 #: include/views/configuration.host.list.php:106 #: include/views/inventory.host.view.php:79 setup.php:62 @@ -14009,7 +13991,7 @@ msgstr "Функции прогнозирования" msgid "Preprocessing" msgstr "Предобработка" -#: app/views/popup.itemtestedit.view.php:353 +#: app/views/popup.itemtestedit.view.php:355 #: app/views/popup.massupdate.item.php:210 #: include/views/configuration.host.discovery.edit.php:877 #: include/views/configuration.item.edit.php:915 @@ -14022,7 +14004,7 @@ msgstr "Шаги предобработки" #: app/controllers/CControllerPopupItemTestSend.php:186 #: app/controllers/CControllerPopupItemTestSend.php:191 #: app/controllers/CControllerPopupItemTestSend.php:196 -#: app/views/popup.itemtestedit.view.php:288 +#: app/views/popup.itemtestedit.view.php:290 msgid "Prev. time" msgstr "Пред. время" @@ -14046,11 +14028,11 @@ msgstr "Предыдущий месяц" #: app/views/monitoring.dashboard.view.php:157 #: app/views/monitoring.dashboard.view.php:175 #: app/views/monitoring.host.dashboard.view.php:94 -#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:184 +#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:182 msgid "Previous page" msgstr "Предыдущая страница" -#: app/views/popup.itemtestedit.view.php:281 +#: app/views/popup.itemtestedit.view.php:283 msgid "Previous value" msgstr "Предыдущее значение" @@ -14093,13 +14075,13 @@ msgid "Primary POC screen name" msgstr "Первичное ник-имя для контакта" #: app/views/popup.discovery.check.php:117 -#: app/views/popup.itemtestedit.view.php:222 +#: app/views/popup.itemtestedit.view.php:224 #: include/views/js/configuration.host.edit.js.php:135 msgid "Privacy passphrase" msgstr "Ключевая фраза безопасности" #: app/views/popup.discovery.check.php:110 -#: app/views/popup.itemtestedit.view.php:212 +#: app/views/popup.itemtestedit.view.php:214 #: include/views/js/configuration.host.edit.js.php:129 msgid "Privacy protocol" msgstr "Протокол безопасности" @@ -14124,14 +14106,17 @@ msgid "Privilege level" msgstr "Уровень привилегий" #: app/partials/monitoring.problem.filter.php:97 +#: app/views/monitoring.service.list.edit.php:147 +#: app/views/monitoring.service.list.edit.php:175 +#: app/views/monitoring.service.list.php:138 #: app/views/monitoring.widget.problems.view.php:60 #: app/views/popup.acknowledge.edit.php:33 #: app/views/popup.mediatype.message.php:49 include/blocks.inc.php:719 -#: include/classes/helpers/CMediatypeHelper.php:45 +#: include/classes/helpers/CMediatypeHelper.php:48 #: include/classes/screens/CScreenProblem.php:873 #: include/classes/screens/CScreenProblem.php:896 -#: include/classes/screens/CScreenProblem.php:1073 -#: include/classes/screens/CScreenProblem.php:1166 +#: include/classes/screens/CScreenProblem.php:1074 +#: include/classes/screens/CScreenProblem.php:1167 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:61 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:61 #: include/classes/widgets/forms/CWidgetFormProblems.php:76 @@ -14141,12 +14126,12 @@ msgstr "Уровень привилегий" #: include/views/configuration.item.list.php:203 #: include/views/configuration.trigger.prototype.list.php:166 #: include/views/configuration.triggers.list.php:95 -#: include/views/configuration.triggers.list.php:305 +#: include/views/configuration.triggers.list.php:306 #: include/views/js/monitoring.sysmaps.js.php:271 msgid "Problem" msgstr "Проблема" -#: include/actions.inc.php:1977 +#: include/actions.inc.php:2032 msgid "Problem created" msgstr "Проблема создана" @@ -14166,54 +14151,53 @@ msgstr "Выражение проблемы" msgid "Problem hosts" msgstr "Узлы сети с проблемами" -#: include/actions.inc.php:337 +#: include/actions.inc.php:360 msgid "Problem is not suppressed" msgstr "Проблема не подавлена" -#: include/actions.inc.php:43 include/actions.inc.php:336 +#: include/actions.inc.php:43 include/actions.inc.php:359 msgid "Problem is suppressed" msgstr "Проблема подавлена" -#: jsLoader.php:282 +#: jsLoader.php:280 msgid "Problem on" msgstr "Проблема с" #: app/views/popup.mediatype.message.php:52 -#: include/classes/helpers/CMediatypeHelper.php:61 +#: include/classes/helpers/CMediatypeHelper.php:64 msgid "Problem recovery" msgstr "Восстановление проблемы" -#: include/actions.inc.php:1980 +#: include/actions.inc.php:2035 msgid "Problem resolved" msgstr "Проблема решена" -#: srv_status.php:147 -msgid "Problem time" -msgstr "Продолжительность проблем" +#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:199 +#: app/views/popup.services.php:58 +msgid "Problem tags" +msgstr "" #: app/views/popup.mediatype.message.php:55 -#: include/classes/helpers/CMediatypeHelper.php:76 +#: include/classes/helpers/CMediatypeHelper.php:79 msgid "Problem update" msgstr "Обновление проблемы" -#: include/services.inc.php:25 +#: include/classes/helpers/CServiceHelper.php:27 msgid "Problem, if all children have problems" msgstr "Проблема, если все подчиненные имеют проблемы" -#: include/services.inc.php:24 +#: include/classes/helpers/CServiceHelper.php:26 msgid "Problem, if at least one child has a problem" msgstr "Проблема, если хотя бы у одного из подчиненных имеется проблема" #: app/controllers/CControllerProblemView.php:155 -#: app/partials/common.filter.trigger.php:47 +#: app/partials/common.filter.trigger.php:48 #: app/partials/monitoring.host.view.html.php:33 #: app/partials/monitoring.host.view.html.php:36 #: app/partials/monitoring.host.view.html.php:115 #: app/partials/monitoring.host.view.html.php:122 #: app/partials/monitoring.problem.filter.php:30 -#: app/views/monitoring.problem.view.php:94 app/views/report.services.php:80 -#: app/views/report.services.php:81 app/views/report.services.php:82 -#: app/views/report.services.php:83 app/views/search.php:80 +#: app/views/monitoring.problem.view.php:94 app/views/search.php:80 #: app/views/search.php:86 app/views/search.php:243 app/views/search.php:249 #: chart4.php:168 include/classes/helpers/CMenuHelper.php:39 #: include/classes/helpers/CRoleHelper.php:380 @@ -14222,7 +14206,7 @@ msgstr "Проблема, если хотя бы у одного из подчи #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35 #: include/classes/widgets/views/widget.svggraph.form.view.php:295 #: include/views/inventory.host.view.php:151 -#: include/views/inventory.host.view.php:156 jsLoader.php:356 report2.php:506 +#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507 msgid "Problems" msgstr "Проблемы" @@ -14239,7 +14223,7 @@ msgstr "Утилизация CPU процесса в процентах. Воз msgid "Process tags" msgstr "Обработка тегов" -#: include/classes/helpers/CMenuHelper.php:373 +#: include/classes/helpers/CMenuHelper.php:375 msgid "Profile" msgstr "Профиль" @@ -14255,8 +14239,8 @@ msgstr "Шаблон Prometheus" msgid "Prometheus to JSON" msgstr "Prometheus в JSON" -#: include/views/monitoring.sysmap.list.php:76 -#: include/views/monitoring.sysmap.list.php:77 jsLoader.php:158 +#: include/views/monitoring.sysmap.list.php:77 +#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156 msgid "Properties" msgstr "Свойства" @@ -14271,8 +14255,8 @@ msgstr "Указанный URL \"%1$s\" ошибочен." #: app/controllers/CControllerPopupGeneric.php:171 #: app/views/administration.proxy.edit.php:29 #: app/views/administration.proxy.list.php:31 -#: include/classes/helpers/CMenuHelper.php:262 -#: include/classes/helpers/CRoleHelper.php:457 +#: include/classes/helpers/CMenuHelper.php:264 +#: include/classes/helpers/CRoleHelper.php:454 msgid "Proxies" msgstr "Прокси" @@ -14281,9 +14265,9 @@ msgstr "Прокси" #: app/views/administration.proxy.edit.php:147 #: app/views/administration.queue.details.php:49 #: app/views/administration.queue.overview.proxy.php:45 -#: app/views/configuration.discovery.list.php:77 -#: app/views/popup.condition.common.php:515 -#: app/views/popup.itemtestedit.view.php:236 include/actions.inc.php:62 +#: app/views/configuration.discovery.list.php:78 +#: app/views/popup.condition.common.php:523 +#: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62 #: include/views/configuration.host.list.php:114 #: include/views/configuration.host.list.php:118 #: include/views/configuration.host.list.php:156 @@ -14377,8 +14361,8 @@ msgstr "Поля запроса" #: app/controllers/CControllerQueueDetails.php:110 #: app/controllers/CControllerQueueOverview.php:80 #: app/controllers/CControllerQueueOverviewProxy.php:71 -#: include/classes/helpers/CMenuHelper.php:296 -#: include/classes/helpers/CRoleHelper.php:464 +#: include/classes/helpers/CMenuHelper.php:298 +#: include/classes/helpers/CRoleHelper.php:461 msgid "Queue" msgstr "Очередь" @@ -14386,7 +14370,7 @@ msgstr "Очередь" #: app/views/administration.queue.details.php:39 #: app/views/administration.queue.overview.php:39 #: app/views/administration.queue.overview.proxy.php:39 -#: include/classes/helpers/CMenuHelper.php:302 +#: include/classes/helpers/CMenuHelper.php:304 msgid "Queue details" msgstr "Детали очереди" @@ -14394,7 +14378,7 @@ msgstr "Детали очереди" #: app/views/administration.queue.overview.php:27 #: app/views/administration.queue.overview.php:33 #: app/views/administration.queue.overview.proxy.php:33 -#: include/classes/helpers/CMenuHelper.php:298 +#: include/classes/helpers/CMenuHelper.php:300 msgid "Queue overview" msgstr "Обзор очереди" @@ -14402,14 +14386,14 @@ msgstr "Обзор очереди" #: app/views/administration.queue.overview.php:36 #: app/views/administration.queue.overview.proxy.php:27 #: app/views/administration.queue.overview.proxy.php:36 -#: include/classes/helpers/CMenuHelper.php:300 +#: include/classes/helpers/CMenuHelper.php:302 msgid "Queue overview by proxy" msgstr "Обзор очереди по прокси" #: app/views/hint.box.php:101 app/views/monitoring.widget.problems.view.php:93 #: include/classes/graph/CSvgGraph.php:1071 #: include/classes/screens/CScreenProblem.php:966 -#: include/classes/screens/CScreenProblem.php:1180 include/events.inc.php:362 +#: include/classes/screens/CScreenProblem.php:1181 include/events.inc.php:365 msgid "RESOLVED" msgstr "РЕШЕНО" @@ -14430,7 +14414,7 @@ msgstr "Сырой post" #: app/partials/administration.usergroup.grouprights.html.php:70 #: app/views/administration.script.edit.php:245 -#: app/views/administration.script.list.php:188 +#: app/views/administration.script.list.php:189 #: app/views/administration.usergroup.edit.php:133 include/users.inc.php:435 msgid "Read" msgstr "Чтение" @@ -14460,15 +14444,11 @@ 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 "Полученное значение" -#: app/partials/common.filter.trigger.php:46 +#: app/partials/common.filter.trigger.php:47 #: app/partials/monitoring.problem.filter.php:29 #: include/classes/widgets/forms/CWidgetFormProblems.php:34 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:34 @@ -14482,10 +14462,10 @@ msgstr "Недавние проблемы" #: app/partials/scheduledreport.subscription.php:33 #: app/views/monitoring.widget.actionlog.view.php:36 #: app/views/popup.scheduledreport.subscription.php:97 -#: app/views/popup.scheduledreport.subscription.php:106 +#: app/views/popup.scheduledreport.subscription.php:105 #: include/classes/widgets/forms/CWidgetFormActionLog.php:37 #: include/classes/widgets/forms/CWidgetFormActionLog.php:38 -#: include/views/administration.auditacts.list.php:65 +#: include/views/administration.auditacts.list.php:66 msgid "Recipient" msgstr "Получатель" @@ -14498,10 +14478,10 @@ msgid "Recipients" msgstr "Получатели" #: app/views/administration.user.edit.php:533 -#: include/classes/screens/CScreenProblem.php:1074 +#: include/classes/screens/CScreenProblem.php:1075 #: include/views/configuration.item.list.php:204 #: include/views/configuration.trigger.prototype.list.php:167 -#: include/views/configuration.triggers.list.php:306 +#: include/views/configuration.triggers.list.php:307 msgid "Recovery" msgstr "Восстановление" @@ -14519,14 +14499,14 @@ msgstr "Выражение восстановления" msgid "Recovery expression syntax error." msgstr "Синтаксическая ошибка в выражении восстановления." -#: include/views/configuration.action.edit.php:393 +#: include/views/configuration.action.edit.php:396 msgid "Recovery operations" msgstr "Операции восстановления" #: app/views/hint.box.php:74 app/views/monitoring.widget.problems.view.php:55 #: include/classes/screens/CScreenProblem.php:868 #: include/classes/screens/CScreenProblem.php:891 -#: include/classes/screens/CScreenProblem.php:1163 include/events.inc.php:283 +#: include/classes/screens/CScreenProblem.php:1164 include/events.inc.php:286 msgid "Recovery time" msgstr "Время восстановления" @@ -14539,7 +14519,7 @@ msgstr "Прямоугольник" msgid "Refresh" msgstr "Обновить" -#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:180 +#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178 msgid "Refresh interval" msgstr "Интервал обновления" @@ -14593,7 +14573,7 @@ msgstr "Регулярное выражение обновлено" #: app/views/administration.regex.edit.php:29 #: app/views/administration.regex.list.php:31 -#: include/classes/helpers/CMenuHelper.php:242 include/html.inc.php:883 +#: include/classes/helpers/CMenuHelper.php:244 include/html.inc.php:883 msgid "Regular expressions" msgstr "Регулярные выражения" @@ -14601,7 +14581,7 @@ msgstr "Регулярные выражения" msgid "Related reports" msgstr "Связанные отчеты" -#: jsLoader.php:165 +#: jsLoader.php:163 msgid "Release to create a widget." msgstr "Отпустите, чтобы создать виджет." @@ -14609,13 +14589,13 @@ msgstr "Отпустите, чтобы создать виджет." msgid "Remember me for 30 days" msgstr "Запомнить меня на 30 дней" -#: include/actions.inc.php:981 include/actions.inc.php:1769 -#: include/actions.inc.php:2023 +#: include/actions.inc.php:1028 include/actions.inc.php:1824 +#: include/actions.inc.php:2078 msgid "Remote command" msgstr "Удаленная команда" #: app/partials/administration.usergroup.tagfilters.html.php:51 -#: app/partials/common.filter.trigger.php:136 +#: app/partials/common.filter.trigger.php:137 #: app/partials/configuration.tags.tab.php:76 #: app/partials/configuration.tags.tab.php:80 #: app/partials/hostmacros.inherited.list.html.php:104 @@ -14633,6 +14613,7 @@ 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.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 @@ -14655,25 +14636,28 @@ 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:208 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158 #: app/views/popup.massupdate.host.php:52 #: app/views/popup.massupdate.host.php:203 #: app/views/popup.massupdate.item.php:137 #: app/views/popup.massupdate.item.php:263 #: app/views/popup.massupdate.item.php:482 +#: app/views/popup.massupdate.service.php:46 #: app/views/popup.massupdate.template.php:54 #: app/views/popup.massupdate.template.php:136 #: app/views/popup.massupdate.trigger.php:83 app/views/popup.media.php:45 -#: app/views/popup.media.php:110 app/views/popup.valuemap.edit.php:91 +#: app/views/popup.media.php:110 app/views/popup.service.edit.php:111 +#: app/views/popup.valuemap.edit.php:91 #: include/classes/helpers/CTagFilterFieldHelper.php:82 #: include/classes/helpers/CTagFilterFieldHelper.php:135 #: include/classes/widgets/CWidgetHelper.php:506 #: include/classes/widgets/CWidgetHelper.php:559 include/forms.inc.php:1456 #: include/forms.inc.php:2004 include/views/configuration.action.edit.php:97 -#: include/views/configuration.action.edit.php:258 -#: include/views/configuration.action.edit.php:286 -#: include/views/configuration.action.edit.php:368 -#: include/views/configuration.action.edit.php:444 +#: include/views/configuration.action.edit.php:259 +#: include/views/configuration.action.edit.php:287 +#: include/views/configuration.action.edit.php:371 +#: include/views/configuration.action.edit.php:449 #: include/views/configuration.host.discovery.edit.php:143 #: include/views/configuration.host.discovery.edit.php:188 #: include/views/configuration.host.discovery.edit.php:214 @@ -14694,8 +14678,6 @@ msgstr "Удаленная команда" #: include/views/configuration.maintenance.edit.php:72 #: include/views/configuration.maintenance.edit.php:164 #: include/views/configuration.maintenance.edit.php:187 -#: include/views/configuration.services.edit.php:143 -#: include/views/configuration.services.edit.php:218 #: include/views/configuration.trigger.prototype.edit.php:244 #: include/views/configuration.trigger.prototype.edit.php:440 #: include/views/configuration.trigger.prototype.edit.php:595 @@ -14727,7 +14709,6 @@ msgstr "Удаленная команда" #: include/views/js/configuration.item.list.js.php:64 #: include/views/js/configuration.item.list.js.php:79 #: include/views/js/configuration.maintenance.edit.js.php:40 -#: include/views/js/configuration.services.edit.js.php:112 #: include/views/js/item.preprocessing.js.php:57 #: include/views/js/monitoring.sysmap.edit.js.php:34 #: include/views/js/monitoring.sysmap.edit.js.php:65 @@ -14743,8 +14724,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:200 -#: jsLoader.php:269 +#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198 +#: jsLoader.php:267 msgid "Remove" msgstr "Удалить" @@ -14761,15 +14742,15 @@ msgstr "Удаление имени домена" msgid "Remove from favourites" msgstr "Удалить из избранного" -#: include/actions.inc.php:987 +#: include/actions.inc.php:1034 msgid "Remove from host group" msgstr "Удалить из группы узлов сети" -#: include/actions.inc.php:685 +#: include/actions.inc.php:717 msgid "Remove from host groups" msgstr "Удалить из групп узлов сети" -#: include/actions.inc.php:658 include/actions.inc.php:983 +#: include/actions.inc.php:690 include/actions.inc.php:1030 msgid "Remove host" msgstr "Удалить узел сети" @@ -14784,7 +14765,7 @@ msgstr "Удаление, %1$s" msgid "Removed" msgstr "Удалено" -#: jsLoader.php:319 +#: jsLoader.php:317 #, c-format msgctxt "screen reader" msgid "Removed, %1$s" @@ -14809,6 +14790,7 @@ msgstr "Периодичность" #: app/views/popup.massupdate.host.php:113 #: app/views/popup.massupdate.host.php:202 #: app/views/popup.massupdate.item.php:481 +#: app/views/popup.massupdate.service.php:45 #: app/views/popup.massupdate.template.php:53 #: app/views/popup.massupdate.template.php:90 #: app/views/popup.massupdate.template.php:135 @@ -14846,7 +14828,7 @@ msgstr "Ошибка при генерировании отчета." msgid "Report generating test successful." msgstr "Тестирование генерирования отчета успешно." -#: app/views/popup.scheduledreport.subscription.php:109 +#: app/views/popup.scheduledreport.subscription.php:108 #, c-format msgid "Report is currently generated by \"%1$s\"." msgstr "Отчет в данный момент сгенерирован \"%1$s\"." @@ -14904,7 +14886,7 @@ msgstr "Требуется" msgid "Required host permissions" msgstr "Требуемые права доступа к узлам сети" -#: app/views/administration.proxy.list.php:79 +#: app/views/administration.proxy.list.php:80 msgid "Required performance (vps)" msgstr "Требуемое быстродействие (знч/сек)" @@ -14927,42 +14909,43 @@ msgstr "Требуемые коды состояния" msgid "Required string" msgstr "Требуемая строка" -#: include/classes/html/CFilter.php:211 include/classes/html/CTabFilter.php:97 +#: app/views/popup.services.php:47 include/classes/html/CFilter.php:215 +#: include/classes/html/CTabFilter.php:97 msgid "Reset" msgstr "Сбросить" #: app/views/js/administration.gui.edit.js.php:32 -#: app/views/js/administration.housekeeping.edit.js.php:71 +#: app/views/js/administration.housekeeping.edit.js.php:72 #: app/views/js/administration.miscconfig.edit.js.php:42 #: app/views/js/administration.trigdisplay.edit.js.php:48 msgid "Reset all fields to default values?" msgstr "Сбросить все поля на значения по умолчанию?" #: app/views/js/administration.gui.edit.js.php:31 -#: app/views/js/administration.housekeeping.edit.js.php:70 +#: app/views/js/administration.housekeeping.edit.js.php:71 #: app/views/js/administration.miscconfig.edit.js.php:41 #: app/views/js/administration.trigdisplay.edit.js.php:47 msgid "Reset confirmation" msgstr "Сбросить подтверждение" #: app/views/administration.gui.edit.php:146 -#: app/views/administration.housekeeping.edit.php:184 +#: app/views/administration.housekeeping.edit.php:193 #: app/views/administration.miscconfig.edit.php:191 #: app/views/administration.trigdisplay.edit.php:168 #: app/views/js/administration.gui.edit.js.php:41 -#: app/views/js/administration.housekeeping.edit.js.php:80 +#: app/views/js/administration.housekeeping.edit.js.php:81 #: app/views/js/administration.miscconfig.edit.js.php:51 #: app/views/js/administration.trigdisplay.edit.js.php:57 msgid "Reset defaults" msgstr "Сбросить по умолчанию" -#: jsLoader.php:283 +#: jsLoader.php:281 msgid "Resolved" msgstr "Решено" -#: include/events.inc.php:228 include/events.inc.php:232 -#: include/events.inc.php:245 include/events.inc.php:248 -#: include/events.inc.php:253 +#: include/events.inc.php:231 include/events.inc.php:235 +#: include/events.inc.php:248 include/events.inc.php:251 +#: include/events.inc.php:256 msgid "Resolved by" msgstr "Решено" @@ -14988,12 +14971,12 @@ msgstr "Решено недоступным пользователем." msgid "Resolved by user \"%1$s\"." msgstr "Решено пользователем \"%1$s\"." -#: app/views/reports.auditlog.list.php:64 -#: app/views/reports.auditlog.list.php:89 +#: app/views/reports.auditlog.list.php:65 +#: app/views/reports.auditlog.list.php:90 msgid "Resource" msgstr "Ресурс" -#: app/views/reports.auditlog.list.php:67 +#: app/views/reports.auditlog.list.php:68 msgid "Resource ID" msgstr "ID ресурса" @@ -15019,8 +15002,8 @@ msgstr "Тип ответа: Строка" #: app/views/administration.regex.edit.php:123 #: app/views/administration.regex.edit.php:128 -#: app/views/popup.itemtestedit.view.php:324 -#: app/views/popup.itemtestedit.view.php:364 +#: app/views/popup.itemtestedit.view.php:326 +#: app/views/popup.itemtestedit.view.php:366 #: app/views/popup.testtriggerexpr.php:49 #: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216 #: include/classes/debug/CProfiler.php:183 @@ -15148,6 +15131,11 @@ msgstr "Роль" msgid "Romanian (ro_RO)" msgstr "Румынский (ro_RO)" +#: app/partials/monitoring.service.list.edit.php:55 +#: app/partials/monitoring.service.list.php:52 +msgid "Root cause" +msgstr "" + #: include/classes/widgets/forms/CWidgetForm.php:81 msgid "Rows" msgstr "Строк" @@ -15164,17 +15152,22 @@ msgstr "Раздел правила не найден." msgid "Rules" msgstr "Правила" -#: include/actions.inc.php:616 include/actions.inc.php:785 +#: include/actions.inc.php:635 include/actions.inc.php:813 +#, c-format +msgid "Run script \"%1$s\" on Zabbix server" +msgstr "" + +#: include/actions.inc.php:648 include/actions.inc.php:826 #, c-format msgid "Run script \"%1$s\" on current host" msgstr "Выполнение скрипта \"%1$s\" на текущем узле сети" -#: include/actions.inc.php:647 include/actions.inc.php:816 +#: include/actions.inc.php:679 include/actions.inc.php:857 #, c-format msgid "Run script \"%1$s\" on host groups" msgstr "Выполнение скрипта \"%1$s\" в группе узлов сети" -#: include/actions.inc.php:629 include/actions.inc.php:798 +#: include/actions.inc.php:661 include/actions.inc.php:839 #, c-format msgid "Run script \"%1$s\" on hosts" msgstr "Выполнение скрипта \"%1$s\" на узлах сети" @@ -15188,12 +15181,12 @@ msgstr "Выполнение заданной команды на узле се msgid "Russian (ru_RU)" msgstr "Русский (ru_RU)" -#: jsLoader.php:247 +#: jsLoader.php:245 msgctxt "Saturday short" msgid "S" msgstr "Сб" -#: jsLoader.php:248 +#: jsLoader.php:246 msgctxt "Sunday short" msgid "S" msgstr "Вс" @@ -15202,9 +15195,11 @@ msgstr "Вс" msgid "SAML settings" msgstr "Настройки SAML" -#: app/views/report.services.php:80 app/views/report.services.php:81 -#: app/views/report.services.php:82 app/views/report.services.php:83 -#: srv_status.php:149 +#: app/partials/monitoring.service.list.edit.php:56 +#: app/partials/monitoring.service.list.php:53 +#: app/views/monitoring.service.list.edit.php:117 +#: app/views/monitoring.service.list.php:108 +#: app/views/popup.service.edit.php:154 app/views/popup.service.edit.php:228 msgid "SLA" msgstr "SLA" @@ -15221,17 +15216,17 @@ msgid "SMTP" msgstr "SMTP" #: app/views/administration.mediatype.edit.php:75 -#: app/views/administration.mediatype.list.php:91 +#: app/views/administration.mediatype.list.php:92 msgid "SMTP email" msgstr "SMTP email" #: app/views/administration.mediatype.edit.php:70 -#: app/views/administration.mediatype.list.php:90 +#: app/views/administration.mediatype.list.php:91 msgid "SMTP helo" msgstr "SMTP helo" #: app/views/administration.mediatype.edit.php:62 -#: app/views/administration.mediatype.list.php:89 +#: app/views/administration.mediatype.list.php:90 msgid "SMTP server" msgstr "SMTP сервер" @@ -15251,7 +15246,7 @@ msgstr "SNMP" #: app/views/popup.discovery.check.php:74 disc_prototypes.php:108 #: host_discovery.php:104 #: include/views/configuration.host.discovery.edit.php:502 -#: include/views/configuration.host.discovery.list.php:145 +#: include/views/configuration.host.discovery.list.php:146 #: include/views/configuration.item.edit.php:558 #: include/views/configuration.item.prototype.edit.php:543 items.php:123 msgid "SNMP OID" @@ -15263,7 +15258,7 @@ msgstr "SNMP агент" #: app/controllers/CControllerPopupItemTest.php:1284 #: app/views/popup.discovery.check.php:68 -#: app/views/popup.itemtestedit.view.php:140 +#: app/views/popup.itemtestedit.view.php:142 #: include/views/js/configuration.host.edit.js.php:89 msgid "SNMP community" msgstr "SNMP community" @@ -15280,7 +15275,7 @@ msgstr "SNMP trap" msgid "SNMP trap key is invalid." msgstr "Ключ SNMP trap ошибочный." -#: app/views/popup.itemtestedit.view.php:124 +#: app/views/popup.itemtestedit.view.php:126 #: include/views/js/configuration.host.edit.js.php:76 msgid "SNMP version" msgstr "Версия SNMP" @@ -15290,7 +15285,7 @@ msgstr "Версия SNMP" msgid "SNMPv%1$d" msgstr "SNMPv%1$d" -#: app/views/popup.itemtestedit.view.php:132 +#: app/views/popup.itemtestedit.view.php:134 #: include/views/js/configuration.host.edit.js.php:80 msgid "SNMPv1" msgstr "SNMPv1" @@ -15299,7 +15294,7 @@ msgstr "SNMPv1" msgid "SNMPv1 agent" msgstr "SNMPv1 агент" -#: app/views/popup.itemtestedit.view.php:133 +#: app/views/popup.itemtestedit.view.php:135 #: include/views/js/configuration.host.edit.js.php:81 msgid "SNMPv2" msgstr "SNMPv2" @@ -15308,7 +15303,7 @@ msgstr "SNMPv2" msgid "SNMPv2 agent" msgstr "SNMPv2 агент" -#: app/views/popup.itemtestedit.view.php:134 +#: app/views/popup.itemtestedit.view.php:136 #: include/views/js/configuration.host.edit.js.php:82 msgid "SNMPv3" msgstr "SNMPv3" @@ -15348,7 +15343,7 @@ msgid "SQL statement execution has failed \"%1$s\"." msgstr "Ошибка при выполнении SQL запроса \"%1$s\"." #: app/views/administration.script.edit.php:117 -#: app/views/administration.script.list.php:143 include/discovery.inc.php:47 +#: app/views/administration.script.list.php:144 include/discovery.inc.php:47 msgid "SSH" msgstr "SSH" @@ -15417,7 +15412,7 @@ msgstr "Sans-Serif" msgid "Sat" msgstr "Сб" -#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:240 +#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238 msgid "Saturday" msgstr "Суббота" @@ -15519,8 +15514,8 @@ msgid "Scheduling" msgstr "По расписанию" #: app/views/administration.script.edit.php:99 -#: app/views/administration.script.list.php:47 -#: app/views/administration.script.list.php:74 +#: app/views/administration.script.list.php:48 +#: app/views/administration.script.list.php:75 msgid "Scope" msgstr "Область" @@ -15534,7 +15529,7 @@ msgstr "Границы" #: app/views/administration.script.edit.php:116 #: app/views/administration.script.edit.php:186 #: app/views/administration.script.edit.php:265 -#: app/views/administration.script.list.php:135 include/items.inc.php:103 +#: app/views/administration.script.list.php:136 include/items.inc.php:103 #: include/items.inc.php:1764 include/media.inc.php:25 #: include/views/configuration.host.discovery.edit.php:229 #: include/views/configuration.item.edit.php:265 @@ -15568,7 +15563,7 @@ msgid "Script execution successful." msgstr "Скрипт выполнен успешно." #: app/views/administration.mediatype.edit.php:96 -#: app/views/administration.mediatype.list.php:95 +#: app/views/administration.mediatype.list.php:96 msgid "Script name" msgstr "Имя скрипта" @@ -15593,8 +15588,8 @@ msgstr "Скрипт обновлен" #: app/controllers/CControllerPopupScriptExec.php:75 #: app/views/administration.script.edit.php:31 #: app/views/administration.script.list.php:31 -#: include/classes/helpers/CMenuHelper.php:291 -#: include/classes/helpers/CRoleHelper.php:463 jsLoader.php:357 +#: include/classes/helpers/CMenuHelper.php:293 +#: include/classes/helpers/CRoleHelper.php:460 jsLoader.php:355 msgid "Scripts" msgstr "Скрипты" @@ -15611,7 +15606,7 @@ msgstr "Атрибут поиска" msgid "Search pattern is empty" msgstr "Шаблон поиска пустой" -#: app/views/monitoring.charts.view.php:103 +#: app/views/monitoring.charts.view.php:104 msgid "Search type" msgstr "Тип поиска" @@ -15652,20 +15647,20 @@ msgid "Security" msgstr "Безопасность" #: app/views/popup.discovery.check.php:92 -#: app/views/popup.itemtestedit.view.php:174 +#: app/views/popup.itemtestedit.view.php:176 #: include/views/js/configuration.host.edit.js.php:105 msgid "Security level" msgstr "Уровень безопасности" #: app/views/popup.discovery.check.php:86 -#: app/views/popup.itemtestedit.view.php:163 +#: app/views/popup.itemtestedit.view.php:165 #: include/views/js/configuration.host.edit.js.php:100 msgid "Security name" msgstr "Имя безопасности" #: app/views/monitoring.widget.navtreeitem.edit.php:48 -#: app/views/popup.condition.common.php:398 app/views/popup.generic.php:638 -#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:132 +#: app/views/popup.condition.common.php:406 app/views/popup.generic.php:638 +#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:91 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86 #: include/classes/widgets/CWidgetHelper.php:359 #: include/views/configuration.graph.edit.php:207 @@ -15673,8 +15668,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/configuration.services.edit.php:99 -#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:317 +#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315 msgid "Select" msgstr "Выбрать" @@ -15694,7 +15688,7 @@ msgstr "Выберите виджет" msgid "Selected" msgstr "Выбранные" -#: actionconf.php:393 +#: actionconf.php:394 msgid "Selected actions deleted" msgstr "Выбранные действия удалены" @@ -15710,31 +15704,31 @@ msgstr "Выбранные элементы" msgid "Selected items only" msgstr "Только выбранные элементы данных" -#: jsLoader.php:322 +#: jsLoader.php:320 #, 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:323 +#: jsLoader.php:321 #, 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:267 +#: jsLoader.php:265 msgid "Send backward" msgstr "Переместить назад" -#: include/actions.inc.php:980 +#: include/actions.inc.php:1027 msgid "Send message" msgstr "Отправить сообщение" -#: include/actions.inc.php:599 include/actions.inc.php:768 +#: include/actions.inc.php:622 include/actions.inc.php:800 msgid "Send message to user groups" msgstr "Отправка сообщения группам пользователей" -#: include/actions.inc.php:581 include/actions.inc.php:750 +#: include/actions.inc.php:604 include/actions.inc.php:782 msgid "Send message to users" msgstr "Отправка сообщение пользователям" @@ -15747,7 +15741,7 @@ msgstr "Отправка только через" msgid "Send to" msgstr "Отправлять на" -#: jsLoader.php:268 +#: jsLoader.php:266 msgid "Send to back" msgstr "На задний план" @@ -15759,8 +15753,8 @@ msgstr "Отправка группам пользователей" msgid "Send to users" msgstr "Отправка пользователям" -#: include/actions.inc.php:2046 -#: include/views/administration.auditacts.list.php:76 +#: include/actions.inc.php:2101 +#: include/views/administration.auditacts.list.php:77 msgid "Sent" msgstr "Отправлено" @@ -15780,11 +15774,11 @@ msgstr "Раздельно" msgid "Separately" msgstr "Раздельно" -#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:231 +#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229 msgid "September" msgstr "Сентябрь" -#: include/hosts.inc.php:134 include/views/inventory.host.list.php:88 +#: include/hosts.inc.php:134 include/views/inventory.host.list.php:89 msgid "Serial number A" msgstr "Серийный номер A" @@ -15798,12 +15792,12 @@ msgstr "Serif" #: app/controllers/CControllerQueueOverviewProxy.php:61 #: app/controllers/CControllerWidgetClockView.php:115 -#: app/views/administration.script.list.php:162 +#: app/views/administration.script.list.php:163 #: include/views/configuration.host.list.php:113 msgid "Server" msgstr "Сервер" -#: app/views/administration.script.list.php:166 +#: app/views/administration.script.list.php:167 msgid "Server (proxy)" msgstr "Сервер (прокси)" @@ -15812,94 +15806,126 @@ msgid "Server time" msgstr "Время на сервере" #: app/controllers/CControllerAuditLogList.php:201 -#: app/views/popup.services.php:46 include/actions.inc.php:75 -#: include/views/configuration.services.edit.php:356 services.php:347 -#: srv_status.php:144 +#: app/controllers/CControllerPopupServiceEdit.php:134 +#: app/views/monitoring.service.list.edit.php:174 +#: app/views/popup.mediatype.message.php:58 +#: app/views/popup.service.edit.php:197 app/views/popup.service.edit.php:227 +#: include/actions.inc.php:67 include/actions.inc.php:77 +#: include/classes/helpers/CMediatypeHelper.php:96 msgid "Service" msgstr "Услуга" -#: include/classes/api/services/CService.php:1074 +#: include/classes/api/services/CService.php:644 +#: include/classes/api/services/CService.php:683 #, c-format -msgid "Service \"%1$s\" cannot be deleted, because it is dependent on another service." -msgstr "Услуга \"%1$s\" не может быть удалена, потому что другая услуга зависит от неё." +msgid "Service \"%1$s\" cannot have problem tags and children at the same time." +msgstr "" -#: include/classes/api/services/CService.php:1093 +#: include/classes/api/services/CService.php:625 #, c-format -msgid "Service \"%1$s\" cannot be dependent on itself." -msgstr "Услуга \"%1$s\" не может зависеть сама от себя." +msgid "Service \"%1$s\" cannot have problem tags with the selected status calculation algorithm." +msgstr "" -#: include/classes/api/services/CService.php:1168 +#: include/classes/api/services/CService.php:619 #, c-format -msgid "Service \"%1$s\" cannot be linked to a trigger and have children at the same time." -msgstr "Услуга \"%1$s\" не может быть связана с триггером и быть подчиненной одновременно." +msgid "Service \"%1$s\" cannot show SLA for the selected status calculation algorithm." +msgstr "" -#: include/classes/api/services/CService.php:1145 +#: include/classes/api/services/CService.php:580 #, c-format -msgid "Service \"%1$s\" is already hardlinked to a different service." -msgstr "Услуга \"%1$s\" уже жестко связана с другой услугой." - -#: app/controllers/CControllerReportServices.php:144 -#: app/views/report.services.php:33 -msgid "Service availability report" -msgstr "Отчет доступности услуг" +msgid "Service \"%1$s\" must have no more than 4 digits after the decimal point." +msgstr "" -#: include/classes/api/services/CService.php:977 -msgid "Service cannot be parent and child at the same time." -msgstr "Услуга не может быть родительской и подчиненной одновременно." +#: include/classes/helpers/CMenuHelper.php:184 +#: include/views/configuration.action.list.php:28 +msgid "Service actions" +msgstr "" -#: services.php:151 +#: app/controllers/CControllerServiceCreate.php:97 msgid "Service created" msgstr "Услуга создана" -#: services.php:107 -msgid "Service deleted" -msgstr "Услуга удалена" +#: app/views/administration.housekeeping.edit.php:58 +msgid "Service data storage period" +msgstr "" -#: app/controllers/CControllerPopupServices.php:118 -msgid "Service dependencies" -msgstr "Зависимости услуги" +#: app/controllers/CControllerServiceDelete.php:64 +#, fuzzy +msgid "Service deleted" +msgid_plural "Services deleted" +msgstr[0] "Услуга удалена" +msgstr[1] "Услуга удалена" +msgstr[2] "Услуга удалена" -#: app/controllers/CControllerPopupServices.php:84 -msgid "Service parent" -msgstr "Родительская услуга" +#: include/actions.inc.php:68 +msgid "Service name" +msgstr "" #: include/actions.inc.php:57 msgid "Service port" msgstr "Порт сервиса" -#: include/services.inc.php:514 +#: app/views/popup.mediatype.message.php:61 +#: include/classes/helpers/CMediatypeHelper.php:119 +msgid "Service recovery" +msgstr "" + +#: app/controllers/CControllerServiceTimeValidate.php:92 +#: include/classes/api/services/CService.php:837 msgid "Service start time must be less than end time." msgstr "Время начала должно быть меньше чем время окончания." -#: include/views/configuration.services.edit.php:229 +#: app/views/popup.condition.common.php:154 +msgid "Service tag name" +msgstr "" + +#: app/views/popup.condition.common.php:157 +msgid "Service tag value" +msgstr "" + +#: app/controllers/CControllerPopupServiceTimeEdit.php:120 +msgid "Service time" +msgstr "" + +#: app/views/popup.service.edit.php:162 msgid "Service times" msgstr "Интервалы времени услуги" -#: app/views/popup.condition.common.php:559 include/actions.inc.php:56 +#: app/views/popup.condition.common.php:567 include/actions.inc.php:56 msgid "Service type" msgstr "Тип сервиса" -#: services.php:145 +#: app/views/popup.mediatype.message.php:64 +#: include/classes/helpers/CMediatypeHelper.php:140 +msgid "Service update" +msgstr "" + +#: app/controllers/CControllerServiceUpdate.php:105 msgid "Service updated" msgstr "Услуга обновлена" -#: app/views/administration.housekeeping.edit.php:86 +#: app/controllers/CControllerServiceListEdit.php:166 +#: app/controllers/CControllerServiceListEditRefresh.php:143 +#: app/controllers/CControllerServiceList.php:139 +#: app/controllers/CControllerServiceListRefresh.php:127 +#: app/views/administration.housekeeping.edit.php:95 +#: app/views/monitoring.service.list.edit.php:189 +#: app/views/monitoring.service.list.php:159 +#: app/views/popup.condition.common.php:645 #: include/classes/helpers/CMenuHelper.php:74 -#: include/classes/helpers/CMenuHelper.php:212 #: include/classes/helpers/CRoleHelper.php:391 -#: include/classes/helpers/CRoleHelper.php:446 -#: include/views/configuration.services.edit.php:30 -#: include/views/configuration.services.edit.php:126 -#: include/views/configuration.services.list.php:27 srv_status.php:26 -#: srv_status.php:155 msgid "Services" msgstr "Услуги" -#: include/classes/api/services/CService.php:1215 +#: include/classes/api/services/CService.php:762 msgid "Services form a circular dependency." msgstr "Услуги образуют круговую зависимость." -#: include/classes/core/ZBase.php:248 include/classes/core/ZBase.php:507 +#: app/controllers/CControllerPopupMassupdateService.php:149 +msgid "Services updated" +msgstr "" + +#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:505 msgid "Session initialization error." msgstr "Ошибка инициализации сессии." @@ -15925,11 +15951,11 @@ msgstr "Задать ошибку в" msgid "Set expiration date and time" msgstr "Задать дату и время срока действия" -#: include/actions.inc.php:990 +#: include/actions.inc.php:1037 msgid "Set host inventory mode" msgstr "Задать режим инвентарных данных узлов сети" -#: include/classes/html/CInputSecret.php:80 jsLoader.php:389 +#: include/classes/html/CInputSecret.php:80 jsLoader.php:387 msgid "Set new value" msgstr "Задать новое значение" @@ -15959,48 +15985,48 @@ msgstr "Настройки" #: app/partials/monitoring.host.filter.php:118 #: app/partials/monitoring.problem.filter.php:102 #: app/views/monitoring.widget.problems.view.php:62 -#: app/views/popup.condition.common.php:213 +#: app/views/popup.condition.common.php:221 #: app/views/popup.lldoperation.php:227 #: app/views/popup.massupdate.trigger.php:53 #: app/views/popup.triggerwizard.php:93 #: include/classes/screens/CScreenHistory.php:274 #: include/classes/screens/CScreenProblem.php:865 #: include/classes/screens/CScreenProblem.php:887 -#: include/classes/screens/CScreenProblem.php:1161 +#: include/classes/screens/CScreenProblem.php:1162 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:70 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:70 #: include/classes/widgets/forms/CWidgetFormProblems.php:85 #: include/classes/widgets/forms/CWidgetFormProblems.php:202 #: include/classes/widgets/forms/CWidgetFormProblems.php:203 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:351 -#: include/events.inc.php:185 include/triggers.inc.php:1144 +#: include/events.inc.php:188 include/triggers.inc.php:1144 #: include/views/configuration.item.list.php:171 #: include/views/configuration.trigger.prototype.edit.php:88 #: include/views/configuration.trigger.prototype.list.php:57 #: include/views/configuration.triggers.edit.php:118 #: include/views/configuration.triggers.list.php:70 -#: include/views/configuration.triggers.list.php:184 +#: include/views/configuration.triggers.list.php:185 #: include/views/reports.toptriggers.php:72 #: include/views/reports.toptriggers.php:83 msgid "Severity" msgstr "Важность" -#: include/actions.inc.php:1706 +#: include/actions.inc.php:1761 msgctxt "screen reader" msgid "Severity changed" msgstr "Важность изменена" -#: include/actions.inc.php:1676 -#: include/classes/screens/CScreenProblem.php:1228 +#: include/actions.inc.php:1731 +#: include/classes/screens/CScreenProblem.php:1229 msgid "Severity changes" msgstr "Изменения важности" -#: include/actions.inc.php:1698 +#: include/actions.inc.php:1753 msgctxt "screen reader" msgid "Severity decreased" msgstr "Важность уменьшена" -#: include/actions.inc.php:1702 +#: include/actions.inc.php:1757 msgctxt "screen reader" msgid "Severity increased" msgstr "Важность увеличена" @@ -16011,15 +16037,15 @@ msgstr "Важность увеличена" msgid "Shape" msgstr "Фигура" -#: include/classes/helpers/CMenuHelper.php:339 +#: include/classes/helpers/CMenuHelper.php:341 msgid "Share" msgstr "Share" -#: app/views/monitoring.dashboard.list.php:98 +#: app/views/monitoring.dashboard.list.php:99 msgid "Shared" msgstr "Общий доступ" -#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:343 +#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341 msgid "Sharing" msgstr "Общий доступ" @@ -16035,22 +16061,22 @@ msgstr "Отсутствует значение опции общего дост msgid "Shortened" msgstr "Сокращённое" -#: app/partials/common.filter.trigger.php:44 +#: app/partials/common.filter.trigger.php:45 #: app/partials/monitoring.problem.filter.php:27 -#: app/views/monitoring.dashboard.list.php:62 -#: app/views/reports.scheduledreport.list.php:53 +#: app/views/monitoring.dashboard.list.php:63 +#: app/views/reports.scheduledreport.list.php:54 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:102 #: include/classes/widgets/forms/CWidgetFormProblems.php:33 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:115 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:187 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:259 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:33 -#: include/views/js/monitoring.sysmaps.js.php:100 report2.php:545 +#: include/views/js/monitoring.sysmaps.js.php:100 report2.php:546 msgid "Show" msgstr "Показать" #: app/partials/monitoring.problem.filter.php:277 -#: app/views/monitoring.latest.view.php:96 +#: app/views/monitoring.latest.view.php:97 msgid "Show details" msgstr "Подробная информация" @@ -16064,7 +16090,7 @@ msgstr "Отображение заголовка" msgid "Show hosts in maintenance" msgstr "Узлы сети в обслуживании" -#: app/views/monitoring.latest.view.php:99 +#: app/views/monitoring.latest.view.php:100 msgid "Show items without data" msgstr "Элементы данных без истории" @@ -16107,7 +16133,7 @@ msgid "Show sidebar" msgstr "Отображать боковую панель" #: app/partials/common.filter.item.php:75 -#: app/partials/common.filter.trigger.php:165 +#: app/partials/common.filter.trigger.php:166 #: app/partials/monitoring.host.filter.php:140 #: app/partials/monitoring.problem.filter.php:249 #: app/views/administration.user.edit.php:595 @@ -16143,7 +16169,7 @@ msgstr "Шкала времени" msgid "Show triggers" msgstr "Отображать триггеры" -#: app/partials/common.filter.trigger.php:160 +#: app/partials/common.filter.trigger.php:161 #: app/partials/monitoring.problem.filter.php:255 #: include/classes/widgets/forms/CWidgetFormProblems.php:184 msgid "Show unacknowledged only" @@ -16161,7 +16187,7 @@ msgstr "Показывать предупреждение, если Zabbix се msgid "Show working time" msgstr "Отображать рабочее время" -#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:254 +#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252 msgid "Shown" msgstr "Отображено" @@ -16185,8 +16211,8 @@ msgstr "Вход с HTTP" msgid "Sign in with Single Sign-On (SAML)" msgstr "Войти через систему единого входа (SAML)" -#: include/classes/helpers/CMenuHelper.php:391 -#: include/classes/helpers/CMenuHelper.php:394 +#: include/classes/helpers/CMenuHelper.php:393 +#: include/classes/helpers/CMenuHelper.php:396 msgid "Sign out" msgstr "Выход" @@ -16270,14 +16296,10 @@ msgstr "Пропущено копирование графика \"%1$s\" в у msgid "Slovak (sk_SK)" msgstr "Slovak (sk_SK)" -#: jsLoader.php:288 +#: jsLoader.php:286 msgid "Snooze" msgstr "Заснуть" -#: include/views/configuration.services.edit.php:126 -msgid "Soft" -msgstr "Нежесткая" - #: include/hosts.inc.php:174 msgid "Software" msgstr "Программное обеспечение" @@ -16320,7 +16342,7 @@ msgstr "Некоторые данные истории этого элемент msgid "Sort entries by" msgstr "Сортировка записей по" -#: include/views/configuration.services.edit.php:114 services.php:42 +#: app/views/popup.service.edit.php:120 msgid "Sort order (0->999)" msgstr "Порядок сортировки (0->999)" @@ -16347,11 +16369,11 @@ msgstr "Испанский (es_ES)" msgid "Specified role was not found." msgstr "Указанная роль не найдена." -#: include/classes/api/services/CAction.php:1758 +#: include/classes/api/services/CAction.php:1774 msgid "Specified script does not exist or you do not have rights on it for action operation command." msgstr "Указанный скрипт не существует или вы не имеете к нему прав доступа в команде операции действия." -#: app/views/monitoring.charts.view.php:172 +#: app/views/monitoring.charts.view.php:173 msgid "Specify host to see the graphs." msgstr "Укажите узел сети, чтобы увидеть графики." @@ -16383,18 +16405,18 @@ msgstr "Стандартные элементы данных" msgid "Start" msgstr "Начало" -#: app/partials/scheduledreport.formgrid.html.php:156 +#: app/partials/scheduledreport.formgrid.html.php:155 msgid "Start date" msgstr "Дата начала" -#: include/views/configuration.action.edit.php:174 +#: include/views/configuration.action.edit.php:175 msgid "Start in" 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:159 +#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157 msgid "Start slideshow" msgstr "Начать слайд-шоу" @@ -16415,9 +16437,9 @@ msgid "Startup time of Zabbix server, Unix timestamp." msgstr "Время запуска Zabbix сервера, Unix timestamp." #: app/partials/configuration.filter.items.php:174 include/forms.inc.php:522 -#: include/views/configuration.host.discovery.list.php:153 -#: include/views/configuration.maintenance.list.php:62 -#: include/views/configuration.maintenance.list.php:88 +#: include/views/configuration.host.discovery.list.php:154 +#: include/views/configuration.maintenance.list.php:63 +#: include/views/configuration.maintenance.list.php:89 #: include/views/configuration.triggers.list.php:73 msgid "State" msgstr "Статус" @@ -16438,58 +16460,64 @@ msgstr "Статистика и доступность кэша записи в #: app/partials/configuration.filter.items.php:184 #: app/partials/monitoring.host.filter.php:125 #: app/partials/monitoring.host.view.html.php:34 +#: app/partials/monitoring.service.list.edit.php:54 +#: app/partials/monitoring.service.list.php:51 #: app/partials/scheduledreport.subscription.php:35 #: app/partials/scheduledreport.table.html.php:44 -#: app/views/administration.mediatype.list.php:52 -#: app/views/administration.mediatype.list.php:79 -#: app/views/administration.module.list.php:49 -#: app/views/administration.module.list.php:77 +#: app/views/administration.mediatype.list.php:53 +#: app/views/administration.mediatype.list.php:80 +#: app/views/administration.module.list.php:50 +#: app/views/administration.module.list.php:78 #: app/views/administration.token.list.php:92 #: app/views/administration.token.list.php:149 -#: app/views/administration.usergroup.list.php:49 -#: app/views/administration.usergroup.list.php:77 -#: app/views/administration.user.list.php:116 +#: app/views/administration.usergroup.list.php:50 +#: app/views/administration.usergroup.list.php:78 +#: app/views/administration.user.list.php:117 #: app/views/administration.user.token.list.php:57 #: app/views/administration.user.token.list.php:104 -#: app/views/configuration.correlation.list.php:52 -#: app/views/configuration.correlation.list.php:77 -#: app/views/configuration.discovery.list.php:52 -#: app/views/configuration.discovery.list.php:80 app/views/hint.box.php:75 +#: app/views/configuration.correlation.list.php:53 +#: app/views/configuration.correlation.list.php:78 +#: app/views/configuration.discovery.list.php:53 +#: app/views/configuration.discovery.list.php:81 app/views/hint.box.php:75 +#: app/views/monitoring.service.list.edit.php:112 +#: app/views/monitoring.service.list.edit.php:142 +#: app/views/monitoring.service.list.php:103 +#: app/views/monitoring.service.list.php:133 #: app/views/monitoring.widget.actionlog.view.php:38 #: app/views/monitoring.widget.problems.view.php:56 #: app/views/popup.massupdate.host.php:96 #: app/views/popup.massupdate.item.php:325 -#: app/views/popup.scheduledreport.subscription.php:116 -#: app/views/reports.scheduledreport.list.php:59 include/actions.inc.php:1756 -#: include/actions.inc.php:1839 include/classes/html/CHostAvailability.php:76 +#: app/views/popup.scheduledreport.subscription.php:115 +#: app/views/reports.scheduledreport.list.php:60 include/actions.inc.php:1811 +#: include/actions.inc.php:1894 include/classes/html/CHostAvailability.php:76 #: include/classes/screens/CScreenHttpTestDetails.php:85 #: include/classes/screens/CScreenHttpTest.php:116 #: include/classes/screens/CScreenProblem.php:869 #: include/classes/screens/CScreenProblem.php:893 -#: include/classes/screens/CScreenProblem.php:1164 +#: include/classes/screens/CScreenProblem.php:1165 #: include/classes/widgets/forms/CWidgetFormActionLog.php:35 #: include/classes/widgets/forms/CWidgetFormActionLog.php:36 -#: include/events.inc.php:284 include/forms.inc.php:515 -#: include/views/administration.auditacts.list.php:67 -#: include/views/configuration.action.list.php:71 -#: include/views/configuration.action.list.php:98 -#: include/views/configuration.host.discovery.list.php:162 -#: include/views/configuration.host.discovery.list.php:200 +#: include/events.inc.php:287 include/forms.inc.php:515 +#: include/views/administration.auditacts.list.php:68 +#: include/views/configuration.action.list.php:73 +#: include/views/configuration.action.list.php:100 +#: include/views/configuration.host.discovery.list.php:163 +#: include/views/configuration.host.discovery.list.php:201 #: include/views/configuration.host.list.php:158 #: include/views/configuration.httpconf.list.php:69 -#: include/views/configuration.httpconf.list.php:139 +#: include/views/configuration.httpconf.list.php:140 #: 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:194 srv_status.php:145 +#: include/views/configuration.triggers.list.php:195 msgid "Status" msgstr "Состояние" -#: app/views/popup.services.php:47 services.php:349 +#: app/views/popup.service.edit.php:198 app/views/popup.services.php:57 msgid "Status calculation" msgstr "Вычисление состояния" -#: include/views/configuration.services.edit.php:77 +#: app/views/popup.service.edit.php:61 msgid "Status calculation algorithm" msgstr "Алгоритм вычисления состояния" @@ -16522,13 +16550,13 @@ msgstr "Только состояние" msgid "Status problem" msgstr "Состояние проблемы" -#: include/actions.inc.php:1839 +#: include/actions.inc.php:1894 #: include/classes/screens/CScreenHttpTestDetails.php:81 msgid "Step" msgstr "Шаг" #: include/classes/screens/CScreenHttpTest.php:129 -#: include/views/configuration.httpconf.list.php:167 +#: include/views/configuration.httpconf.list.php:168 #, c-format msgid "Step \"%1$s\" [%2$s of %3$s] failed: %4$s" msgstr "Шаг \"%1$s\" [%2$s из %3$s] завершен с ошибкой: %4$s" @@ -16547,7 +16575,7 @@ msgid "Step with name \"%1$s\" already exists." msgstr "Шаг с именем \"%1$s\" уже существует." #: app/partials/popup.operations.php:51 httpconf.php:53 -#: include/views/configuration.action.edit.php:174 +#: include/views/configuration.action.edit.php:175 #: include/views/configuration.httpconf.edit.php:227 #: include/views/configuration.httpconf.edit.php:236 msgid "Steps" @@ -16566,7 +16594,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:160 +#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158 msgid "Stop slideshow" msgstr "Остановить слайд-шоу" @@ -16593,7 +16621,7 @@ msgstr "Хранение в HashiCorp Vault секрете" msgid "Straight" msgstr "Straight" -#: app/views/monitoring.charts.view.php:105 +#: app/views/monitoring.charts.view.php:106 msgid "Strict" msgstr "Строгий" @@ -16616,10 +16644,10 @@ msgid "Subfilter" msgstr "Подфильтр" #: app/partials/popup.operations.php:152 -#: app/partials/scheduledreport.formgrid.html.php:174 -#: app/views/popup.mediatype.message.php:73 +#: app/partials/scheduledreport.formgrid.html.php:173 +#: app/views/popup.mediatype.message.php:82 #: app/views/popup.mediatypetest.edit.php:69 -#: include/views/administration.auditacts.list.php:92 +#: include/views/administration.auditacts.list.php:93 msgid "Subject" msgstr "Тема" @@ -16631,7 +16659,7 @@ msgctxt "encryption certificate" msgid "Subject" msgstr "Субъект" -#: jsLoader.php:358 +#: jsLoader.php:356 msgid "Submap" msgstr "Подкарта" @@ -16639,7 +16667,7 @@ msgstr "Подкарта" msgid "Subscription" msgstr "Подписка" -#: app/partials/scheduledreport.formgrid.html.php:192 +#: app/partials/scheduledreport.formgrid.html.php:191 msgid "Subscriptions" msgstr "Подписки" @@ -16647,7 +16675,7 @@ msgstr "Подписки" msgid "Success Audit" msgstr "Аудит успеха" -#: include/func.inc.php:1631 jsLoader.php:217 +#: include/func.inc.php:1631 jsLoader.php:215 msgid "Success message" msgstr "Сообщение об успехе" @@ -16660,7 +16688,7 @@ msgstr "Суммарная статистика входящего и исход msgid "Sun" msgstr "Вс" -#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:241 +#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239 msgid "Sunday" msgstr "Воскресенье" @@ -16668,7 +16696,7 @@ msgstr "Воскресенье" msgid "Super admin" msgstr "Супер-администратор" -#: include/classes/helpers/CMenuHelper.php:332 +#: include/classes/helpers/CMenuHelper.php:334 #: include/views/general.login.php:94 msgid "Support" msgstr "Поддержка" @@ -16680,8 +16708,8 @@ msgstr "Подавлено до: %1$s" #: app/controllers/CControllerPopupGeneric.php:233 #: app/views/administration.user.edit.php:80 -#: app/views/administration.user.list.php:70 -#: app/views/administration.user.list.php:108 +#: app/views/administration.user.list.php:71 +#: app/views/administration.user.list.php:109 msgid "Surname" msgstr "Фамилия" @@ -16759,12 +16787,12 @@ msgstr "Системное время. Возвращает целое числ msgid "System uptime in seconds. Returns integer" msgstr "Системное время в секундах. Возвращает число" -#: jsLoader.php:245 +#: jsLoader.php:243 msgctxt "Thursday short" msgid "T" msgstr "Чт" -#: jsLoader.php:243 +#: jsLoader.php:241 msgctxt "Tuesday short" msgid "T" msgstr "Вт" @@ -16800,9 +16828,9 @@ msgstr "У таблицы \"%1$s\" нет поля с названием \"%2$s\ #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/views/popup.condition.common.php:74 #: app/views/popup.condition.common.php:139 -#: app/views/popup.condition.common.php:302 -#: app/views/popup.condition.common.php:318 include/hosts.inc.php:144 -#: include/views/inventory.host.list.php:89 +#: app/views/popup.condition.common.php:310 +#: app/views/popup.condition.common.php:326 include/hosts.inc.php:144 +#: include/views/inventory.host.list.php:90 msgid "Tag" msgstr "Этикетка" @@ -16832,29 +16860,37 @@ msgstr "Значение тега" #: app/controllers/CControllerPopupLldOperation.php:138 #: app/partials/administration.usergroup.tagfilters.html.php:29 #: app/partials/common.filter.item.php:69 -#: app/partials/common.filter.trigger.php:154 +#: app/partials/common.filter.trigger.php:155 #: app/partials/configuration.filter.items.php:166 #: app/partials/monitoring.host.filter.php:133 #: app/partials/monitoring.host.view.html.php:32 #: app/partials/monitoring.latest.view.html.php:58 #: app/partials/monitoring.latest.view.html.php:71 -#: app/partials/monitoring.problem.filter.php:231 app/views/hint.box.php:78 -#: app/views/monitoring.latest.view.php:95 -#: app/views/monitoring.web.view.php:87 +#: app/partials/monitoring.problem.filter.php:231 +#: app/partials/monitoring.service.list.edit.php:57 +#: app/partials/monitoring.service.list.php:54 app/views/hint.box.php:78 +#: app/views/monitoring.latest.view.php:96 +#: app/views/monitoring.service.list.edit.php:124 +#: app/views/monitoring.service.list.edit.php:170 +#: app/views/monitoring.service.list.php:115 +#: app/views/monitoring.service.list.php:145 +#: app/views/monitoring.web.view.php:88 #: app/views/monitoring.widget.problems.view.php:68 #: app/views/popup.lldoperation.php:264 #: app/views/popup.massupdate.host.php:198 #: app/views/popup.massupdate.host.php:293 #: app/views/popup.massupdate.item.php:477 #: app/views/popup.massupdate.item.php:493 +#: app/views/popup.massupdate.service.php:40 #: app/views/popup.massupdate.template.php:131 #: app/views/popup.massupdate.template.php:149 #: app/views/popup.massupdate.trigger.php:78 -#: app/views/popup.massupdate.trigger.php:153 include/blocks.inc.php:724 -#: include/classes/screens/CScreenHttpTest.php:117 +#: app/views/popup.massupdate.trigger.php:153 +#: app/views/popup.service.edit.php:175 app/views/popup.service.edit.php:229 +#: include/blocks.inc.php:724 include/classes/screens/CScreenHttpTest.php:117 #: include/classes/screens/CScreenProblem.php:847 #: include/classes/screens/CScreenProblem.php:903 -#: include/classes/screens/CScreenProblem.php:1171 +#: include/classes/screens/CScreenProblem.php:1172 #: include/classes/widgets/forms/CWidgetFormDataOver.php:51 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:79 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:79 @@ -16862,7 +16898,7 @@ msgstr "Значение тега" #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:376 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:67 #: include/classes/widgets/forms/CWidgetFormWeb.php:61 -#: include/events.inc.php:260 include/forms.inc.php:89 +#: include/events.inc.php:263 include/forms.inc.php:89 #: include/views/configuration.host.edit.php:354 #: include/views/configuration.host.list.php:135 #: include/views/configuration.host.list.php:162 @@ -16870,7 +16906,7 @@ msgstr "Значение тега" #: include/views/configuration.host.prototype.list.php:63 #: include/views/configuration.httpconf.edit.php:237 #: include/views/configuration.httpconf.list.php:77 -#: include/views/configuration.httpconf.list.php:140 +#: include/views/configuration.httpconf.list.php:141 #: include/views/configuration.item.edit.php:904 #: include/views/configuration.item.list.php:93 #: include/views/configuration.item.prototype.edit.php:786 @@ -16883,7 +16919,7 @@ msgstr "Значение тега" #: include/views/configuration.trigger.prototype.list.php:63 #: include/views/configuration.triggers.edit.php:574 #: include/views/configuration.triggers.list.php:111 -#: include/views/configuration.triggers.list.php:196 +#: include/views/configuration.triggers.list.php:197 #: include/views/js/monitoring.sysmaps.js.php:230 msgid "Tags" msgstr "Теги" @@ -16906,7 +16942,7 @@ msgid "Target type" msgstr "Тип цели" #: app/views/administration.script.edit.php:118 -#: app/views/administration.script.list.php:147 include/discovery.inc.php:61 +#: app/views/administration.script.list.php:148 include/discovery.inc.php:61 msgid "Telnet" msgstr "Telnet" @@ -16914,13 +16950,13 @@ msgstr "Telnet" #: 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 -#: include/views/configuration.graph.list.php:148 -#: include/views/configuration.host.discovery.list.php:191 -#: include/views/configuration.httpconf.list.php:129 +#: include/views/configuration.graph.list.php:149 +#: include/views/configuration.host.discovery.list.php:192 +#: include/views/configuration.httpconf.list.php:130 #: include/views/configuration.item.list.php:83 #: include/views/configuration.template.edit.php:46 #: include/views/configuration.template.edit.php:118 -#: include/views/configuration.triggers.list.php:189 report2.php:390 +#: include/views/configuration.triggers.list.php:190 report2.php:390 msgid "Template" msgstr "Шаблон" @@ -17015,18 +17051,18 @@ msgstr "Шаблон с таким же видимым именем \"%1$s\" у #: app/controllers/CControllerPopupImportCompare.php:164 #: app/partials/configuration.filter.items.php:72 #: app/partials/popup.operations.php:212 -#: app/views/popup.condition.common.php:352 app/views/popup.import.php:31 +#: app/views/popup.condition.common.php:360 app/views/popup.import.php:31 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219 #: app/views/search.php:223 app/views/search.php:365 #: include/classes/helpers/CMenuHelper.php:153 #: include/classes/helpers/CRoleHelper.php:432 #: include/views/configuration.copy.elements.php:63 -#: include/views/configuration.graph.list.php:96 -#: include/views/configuration.host.discovery.list.php:80 +#: include/views/configuration.graph.list.php:97 +#: include/views/configuration.host.discovery.list.php:81 #: include/views/configuration.host.edit.php:315 -#: include/views/configuration.hostgroups.list.php:65 -#: include/views/configuration.hostgroups.list.php:177 -#: include/views/configuration.hostgroups.list.php:181 +#: include/views/configuration.hostgroups.list.php:66 +#: include/views/configuration.hostgroups.list.php:178 +#: include/views/configuration.hostgroups.list.php:182 #: include/views/configuration.host.list.php:81 #: include/views/configuration.host.list.php:157 #: include/views/configuration.host.prototype.edit.php:303 @@ -17048,12 +17084,12 @@ msgid "Templates updated" msgstr "Шаблоны обновлены" #: app/controllers/CControllerPopupTestTriggerExpr.php:212 -#: app/partials/scheduledreport.formgrid.html.php:217 +#: app/partials/scheduledreport.formgrid.html.php:215 #: app/views/administration.authentication.edit.php:271 -#: app/views/administration.mediatype.list.php:139 +#: app/views/administration.mediatype.list.php:140 #: app/views/administration.regex.edit.php:140 #: app/views/js/popup.itemtestedit.view.js.php:573 -#: app/views/popup.itemtestedit.view.php:434 +#: app/views/popup.itemtestedit.view.php:436 #: app/views/popup.mediatypetest.edit.php:99 #: app/views/popup.testtriggerexpr.php:124 include/forms.inc.php:1452 #: include/views/configuration.host.discovery.edit.php:902 @@ -17262,7 +17298,7 @@ msgstr "Это поле автоматически заполняется \"%1$s msgid "This is the test message from Zabbix" msgstr "Это тестовое сообщение от Zabbix" -#: include/func.inc.php:2493 srv_status.php:40 +#: include/func.inc.php:2493 msgid "This month" msgstr "Этот месяц" @@ -17270,7 +17306,7 @@ msgstr "Этот месяц" msgid "This month so far" msgstr "В этом месяце" -#: include/func.inc.php:2491 srv_status.php:39 +#: include/func.inc.php:2491 msgid "This week" msgstr "Эта неделя" @@ -17278,7 +17314,7 @@ msgstr "Эта неделя" msgid "This week so far" msgstr "На этой неделе" -#: include/func.inc.php:2495 srv_status.php:41 +#: include/func.inc.php:2495 msgid "This year" msgstr "Этот год" @@ -17298,14 +17334,12 @@ msgstr "Троттлинг" msgid "Thu" msgstr "Чт" -#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:238 +#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236 msgid "Thursday" msgstr "Четверг" -#: app/views/report.services.php:82 -#: include/views/configuration.services.edit.php:266 -#: include/views/configuration.services.edit.php:321 report4.php:191 -#: services.php:48 services.php:186 +#: app/views/popup.service.time.edit.php:87 +#: app/views/popup.service.time.edit.php:132 report4.php:191 msgid "Till" msgstr "До" @@ -17314,22 +17348,21 @@ msgstr "До" #: app/views/hint.box.php:62 app/views/hint.box.php:68 #: app/views/monitoring.widget.actionlog.view.php:33 #: app/views/monitoring.widget.problems.view.php:38 -#: app/views/popup.itemtestedit.view.php:269 +#: app/views/popup.itemtestedit.view.php:271 +#: app/views/popup.service.time.edit.php:68 +#: app/views/popup.service.time.edit.php:94 #: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177 -#: app/views/reports.auditlog.list.php:86 include/actions.inc.php:1623 -#: include/actions.inc.php:1676 include/actions.inc.php:1756 -#: include/actions.inc.php:1839 include/actions.inc.php:1894 +#: app/views/reports.auditlog.list.php:87 include/actions.inc.php:1678 +#: include/actions.inc.php:1731 include/actions.inc.php:1811 +#: include/actions.inc.php:1894 include/actions.inc.php:1949 #: include/blocks.inc.php:699 include/classes/screens/CScreenProblem.php:824 -#: include/classes/screens/CScreenProblem.php:1162 +#: include/classes/screens/CScreenProblem.php:1163 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31 #: include/classes/widgets/forms/CWidgetFormActionLog.php:32 #: include/classes/widgets/forms/CWidgetFormProblems.php:200 #: include/classes/widgets/forms/CWidgetFormProblems.php:201 -#: include/events.inc.php:189 include/events.inc.php:282 -#: include/views/administration.auditacts.list.php:62 -#: include/views/configuration.services.edit.php:311 -#: include/views/configuration.services.edit.php:325 -#: include/views/configuration.services.edit.php:360 +#: include/events.inc.php:192 include/events.inc.php:285 +#: include/views/administration.auditacts.list.php:63 msgid "Time" msgstr "Время" @@ -17402,12 +17435,11 @@ msgstr "Отметка времени" msgid "To" msgstr "К" -#: jsLoader.php:370 +#: jsLoader.php:368 msgid "To set a host interface select a single item type for all items" msgstr "Чтобы задать интерфейс узла сети выберите один тип элемента данных из всех элементов данных" #: include/classes/screens/CScreenProblem.php:709 include/func.inc.php:2489 -#: srv_status.php:38 msgid "Today" msgstr "Сегодня" @@ -17515,7 +17547,7 @@ msgstr "Период хранения динамики изменений" #: app/partials/configuration.filter.items.php:156 #: app/partials/monitoring.latest.view.html.php:53 -#: app/views/administration.housekeeping.edit.php:142 +#: app/views/administration.housekeeping.edit.php:151 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:57 #: include/forms.inc.php:557 include/views/configuration.item.list.php:90 #: include/views/configuration.item.prototype.list.php:63 items.php:262 @@ -17525,17 +17557,13 @@ msgstr "Динамика изменений" #: app/controllers/CControllerAuditLogList.php:194 #: app/controllers/CControllerPopupTriggerWizard.php:223 #: app/controllers/CControllerPopupTriggerWizard.php:294 -#: app/views/popup.massupdate.trigger.php:152 app/views/popup.services.php:48 -#: include/actions.inc.php:46 include/classes/graphdraw/CLineGraphDraw.php:472 -#: include/events.inc.php:253 include/maps.inc.php:26 -#: include/triggers.inc.php:1137 -#: include/views/configuration.services.edit.php:96 -#: include/views/configuration.services.edit.php:126 +#: app/views/popup.massupdate.trigger.php:152 include/actions.inc.php:46 +#: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256 +#: include/maps.inc.php:26 include/triggers.inc.php:1137 #: 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:257 jsLoader.php:359 -#: services.php:350 +#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357 msgid "Trigger" msgstr "Триггер" @@ -17544,7 +17572,7 @@ msgstr "Триггер" msgid "Trigger \"%1$s\" already exists on \"%2$s\"." msgstr "Триггер \"%1$s\" уже существует у \"%2$s\"." -#: include/classes/api/services/CTriggerGeneral.php:1855 +#: include/classes/api/services/CTriggerGeneral.php:1841 #, c-format msgid "Trigger \"%1$s\" belongs to templates with different linkages." msgstr "Триггер \"%1$s\" принадлежит шаблонам с разными связями." @@ -17599,7 +17627,7 @@ msgstr[2] "Триггеры деактивированы" #: app/views/administration.trigdisplay.edit.php:31 #: app/views/administration.trigdisplay.edit.php:165 -#: include/classes/helpers/CMenuHelper.php:247 include/html.inc.php:885 +#: include/classes/helpers/CMenuHelper.php:249 include/html.inc.php:885 msgid "Trigger displaying options" msgstr "Опции отображения триггеров" @@ -17615,7 +17643,7 @@ msgstr[2] "Триггеры активированы" msgid "Trigger has items from template \"%1$s\" that is not linked to host." msgstr "У триггера есть элементы данных из шаблона \"%1$s\", которые не соединены с узлом сети." -#: include/actions.inc.php:1212 +#: include/actions.inc.php:1267 msgid "Trigger in \"unknown\" state" msgstr "Триггер в \"неизвестном\" состоянии" @@ -17652,12 +17680,12 @@ msgstr "Прототип триггеров" msgid "Trigger prototype \"%1$s\" already exists on \"%2$s\"." msgstr "Прототип триггера \"%1$s\" уже существует у \"%2$s\"." -#: include/classes/api/services/CTriggerGeneral.php:1859 +#: include/classes/api/services/CTriggerGeneral.php:1845 #, c-format msgid "Trigger prototype \"%1$s\" belongs to templates with different linkages." msgstr "Прототип триггера \"%1$s\" принадлежит шаблонам с разными связями." -#: include/classes/api/services/CTriggerGeneral.php:1757 +#: include/classes/api/services/CTriggerGeneral.php:1743 #, c-format msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules." msgstr "Прототип триггеров \"%1$s\" содержит прототипы элементов данных из нескольких правил обнаружения." @@ -17667,7 +17695,7 @@ msgstr "Прототип триггеров \"%1$s\" содержит прото msgid "Trigger prototype \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "Прототип триггеров \"%1$s\" зависит от триггера \"%2$s\", который не существует." -#: include/classes/api/services/CTriggerGeneral.php:1752 +#: include/classes/api/services/CTriggerGeneral.php:1738 #, c-format msgid "Trigger prototype \"%1$s\" must contain at least one item prototype." msgstr "Прототип триггеров \"%1$s\" должен содержать по крайней мере один прототип элементов данных." @@ -17695,7 +17723,7 @@ msgstr[2] "Прототипы триггеров обновлены" #: app/controllers/CControllerPopupGeneric.php:197 #: app/controllers/CControllerPopupImportCompare.php:173 #: include/html.inc.php:454 -#: include/views/configuration.host.discovery.list.php:289 +#: include/views/configuration.host.discovery.list.php:290 #: include/views/configuration.trigger.prototype.edit.php:29 #: include/views/configuration.trigger.prototype.list.php:27 msgid "Trigger prototypes" @@ -17713,11 +17741,11 @@ msgstr "Прототипы триггеров обновлены" msgid "Trigger severity" msgstr "Важность триггеров" -#: jsLoader.php:344 +#: jsLoader.php:342 msgid "Trigger status \"OK\"" msgstr "Состояние триггера \"ОК\"" -#: jsLoader.php:345 +#: jsLoader.php:343 msgid "Trigger status \"Problem\"" msgstr "Состояние триггера \"Проблема\"" @@ -17734,10 +17762,10 @@ msgstr "Триггер обновлен" #: app/partials/configuration.filter.items.php:191 #: app/partials/monitoring.problem.filter.php:74 #: app/partials/trigoverview.table.top.php:29 -#: app/views/popup.condition.common.php:201 app/views/popup.import.php:37 +#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308 #: app/views/search.php:313 include/html.inc.php:341 -#: include/views/configuration.host.discovery.list.php:194 +#: include/views/configuration.host.discovery.list.php:195 #: include/views/configuration.host.list.php:150 #: include/views/configuration.host.list.php:378 #: include/views/configuration.item.list.php:86 @@ -17745,7 +17773,7 @@ msgstr "Триггер обновлен" #: include/views/configuration.template.list.php:119 #: include/views/configuration.template.list.php:215 #: include/views/configuration.triggers.edit.php:28 -#: include/views/configuration.triggers.list.php:145 +#: include/views/configuration.triggers.list.php:146 #: include/views/inventory.host.view.php:188 #: include/views/inventory.host.view.php:216 #: include/views/js/monitoring.sysmaps.js.php:170 triggers.php:570 @@ -17769,7 +17797,7 @@ msgstr "Обрезать" msgid "Tue" msgstr "Вт" -#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:236 +#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234 msgid "Tuesday" msgstr "Вторник" @@ -17782,7 +17810,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:262 +#: jsLoader.php:260 msgid "Two map elements should be selected" msgstr "Необходимо выбрать два элемента карты" @@ -17792,39 +17820,38 @@ msgstr "Необходимо выбрать два элемента карты" #: app/partials/monitoring.latest.view.html.php:54 #: app/views/administration.image.list.php:38 #: app/views/administration.mediatype.edit.php:56 -#: app/views/administration.mediatype.list.php:78 +#: app/views/administration.mediatype.list.php:79 #: app/views/administration.script.edit.php:113 -#: app/views/administration.script.list.php:76 +#: app/views/administration.script.list.php:77 #: app/views/administration.user.edit.php:254 #: app/views/configuration.discovery.edit.php:79 #: app/views/dashboard.share.edit.php:78 #: app/views/monitoring.widget.actionlog.view.php:35 #: app/views/popup.condition.common.php:49 -#: app/views/popup.condition.common.php:161 -#: app/views/popup.condition.common.php:625 app/views/popup.generic.php:133 +#: app/views/popup.condition.common.php:169 +#: app/views/popup.condition.common.php:660 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.triggerwizard.php:47 app/views/popup.triggerwizard.php:124 -#: app/views/popup.valuemap.edit.php:51 +#: app/views/popup.service.edit.php:133 app/views/popup.triggerwizard.php:47 +#: app/views/popup.triggerwizard.php:124 app/views/popup.valuemap.edit.php:51 #: include/classes/widgets/CWidgetHelper.php:50 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34 #: include/hosts.inc.php:99 include/hosts.inc.php:1287 -#: include/views/administration.auditacts.list.php:64 +#: include/views/administration.auditacts.list.php:65 #: include/views/configuration.graph.edit.php:364 #: include/views/configuration.host.discovery.edit.php:63 #: include/views/configuration.host.discovery.edit.php:584 -#: include/views/configuration.host.discovery.list.php:137 -#: include/views/configuration.host.discovery.list.php:199 +#: include/views/configuration.host.discovery.list.php:138 +#: include/views/configuration.host.discovery.list.php:200 #: include/views/configuration.item.edit.php:84 #: include/views/configuration.item.edit.php:675 #: include/views/configuration.item.list.php:91 #: include/views/configuration.item.prototype.edit.php:66 #: include/views/configuration.item.prototype.edit.php:654 #: include/views/configuration.item.prototype.list.php:64 -#: include/views/configuration.maintenance.list.php:85 -#: include/views/configuration.services.edit.php:180 -#: include/views/inventory.host.list.php:86 +#: include/views/configuration.maintenance.list.php:86 +#: include/views/inventory.host.list.php:87 #: include/views/js/monitoring.sysmaps.js.php:88 #: include/views/js/monitoring.sysmaps.js.php:413 #: include/views/js/monitoring.sysmaps.js.php:637 @@ -17883,7 +17910,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:360 +#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358 msgid "URL" msgstr "URL" @@ -17929,12 +17956,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:361 +#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359 msgid "URLs" msgstr "URLы" -#: include/classes/validators/CApiInputValidator.php:2263 -#: include/classes/validators/CApiInputValidator.php:2269 +#: include/classes/validators/CApiInputValidator.php:2293 +#: include/classes/validators/CApiInputValidator.php:2299 msgid "UUIDv4 is expected" msgstr "Ожидается UUIDv4" @@ -17965,7 +17992,7 @@ msgstr "Не удалось загрузить параметры аутенти msgid "Unable to load database credentials from Vault." msgstr "Не удалось загрузить базу данных учётных данных c Хранилища." -#: include/classes/helpers/CHousekeepingHelper.php:65 +#: include/classes/helpers/CHousekeepingHelper.php:66 msgid "Unable to load housekeeping API parameters." msgstr "Не удалось загрузить API параметры очистки базы данных." @@ -17993,7 +18020,7 @@ msgstr "Не удалось загрузить файл, так как \"file_up msgid "Unacknowledge" msgstr "Отменить подтверждение" -#: include/actions.inc.php:1997 +#: include/actions.inc.php:2052 msgid "Unacknowledged" msgstr "Подтверждение отменено" @@ -18011,19 +18038,24 @@ msgstr "Неподтвержденные РЕШЕННЫЕ события" msgid "Unacknowledged only" msgstr "Только неподтвержденные" -#: app/views/administration.user.list.php:249 +#: app/views/administration.user.list.php:250 msgid "Unblock" msgstr "Разблокировать" -#: app/views/administration.user.list.php:249 +#: app/views/administration.user.list.php:250 msgid "Unblock selected users?" msgstr "Разблокировать выбранных пользователей?" -#: include/classes/core/ZBase.php:610 +#: include/classes/core/ZBase.php:608 #, c-format msgid "Unexpected response for action %1$s." msgstr "Неожиданный ответ для действия %1$s." +#: app/views/js/popup.service.edit.js.php:308 +#: app/views/js/popup.service.time.edit.js.php:82 +msgid "Unexpected server error." +msgstr "" + #: app/views/popup.massupdate.item.php:165 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:156 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:228 @@ -18037,12 +18069,12 @@ msgstr "Ед. измерения" #: app/views/monitoring.widget.hostavail.view.php:34 #: app/views/monitoring.widget.hostavail.view.php:66 #: app/views/monitoring.widget.hostavail.view.php:104 -#: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:115 -#: include/actions.inc.php:1002 include/classes/html/CHostAvailability.php:79 +#: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118 +#: include/actions.inc.php:1049 include/classes/html/CHostAvailability.php:79 #: include/classes/screens/CScreenHttpTestDetails.php:115 #: include/correlation.inc.php:146 include/discovery.inc.php:115 -#: include/discovery.inc.php:151 include/events.inc.php:44 -#: include/events.inc.php:74 include/graphs.inc.php:37 +#: include/discovery.inc.php:151 include/events.inc.php:45 +#: include/events.inc.php:76 include/graphs.inc.php:37 #: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74 #: include/html.inc.php:291 include/httptest.inc.php:41 #: include/httptest.inc.php:58 include/items.inc.php:45 @@ -18051,12 +18083,12 @@ msgstr "Ед. измерения" #: include/maps.inc.php:39 include/regexp.inc.php:236 #: include/triggers.inc.php:119 include/triggers.inc.php:260 #: include/triggers.inc.php:2042 include/users.inc.php:64 -#: include/users.inc.php:87 include/views/configuration.action.edit.php:235 +#: include/users.inc.php:87 include/views/configuration.action.edit.php:236 #: include/views/configuration.triggers.list.php:77 msgid "Unknown" msgstr "Неизвестно" -#: app/views/reports.auditlog.list.php:114 +#: app/views/reports.auditlog.list.php:115 msgid "Unknown action" msgstr "Неизвестное действие" @@ -18064,7 +18096,7 @@ msgstr "Неизвестное действие" #: include/classes/screens/CScreenHttpTestDetails.php:110 #: include/classes/screens/CScreenHttpTestDetails.php:182 #: include/classes/screens/CScreenHttpTest.php:126 -#: include/views/configuration.httpconf.list.php:171 +#: include/views/configuration.httpconf.list.php:172 msgid "Unknown error" msgstr "Неизвестная ошибка" @@ -18083,12 +18115,12 @@ msgstr "Неизвестный узел сети, такого узла сети msgid "Unknown interface type." msgstr "Неизвестный тип интерфейса." -#: app/views/reports.auditlog.list.php:111 +#: app/views/reports.auditlog.list.php:112 msgid "Unknown resource" msgstr "Неизвестный ресурс" #: include/classes/screens/CScreenHttpTest.php:134 -#: include/views/configuration.httpconf.list.php:173 +#: include/views/configuration.httpconf.list.php:174 #, c-format msgid "Unknown step failed: %1$s" msgstr "Ошибка в неизвестном шаге: %1$s" @@ -18114,15 +18146,15 @@ msgstr "Отсоединить" msgid "Unlink and clear" msgstr "Отсоединить и очистить" -#: include/actions.inc.php:989 +#: include/actions.inc.php:1036 msgid "Unlink from template" msgstr "Отсоединить от шаблона" -#: include/actions.inc.php:707 +#: include/actions.inc.php:739 msgid "Unlink from templates" msgstr "Отсоединить от шаблонов" -#: jsLoader.php:286 +#: jsLoader.php:284 msgid "Unmute" msgstr "Включить звук" @@ -18149,7 +18181,7 @@ msgstr "Неподдерживаемый формат импорта \"%1$s\"." msgid "Unsupported operation." msgstr "Неподдерживаемая операция." -#: include/classes/api/services/CAction.php:2641 +#: include/classes/api/services/CAction.php:2656 #, c-format msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для действия условия фильтра \"%1$s\"." @@ -18159,7 +18191,7 @@ msgstr "Неподдерживаемый параметр \"%2$s\" для дей msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для правила обнаружения условия фильтра \"%1$s\"." -#: include/classes/api/services/CAction.php:2602 +#: include/classes/api/services/CAction.php:2617 #, c-format msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"." msgstr "Неподдерживаемый параметр \"%2$s\" для фильтра в действии \"%1$s\"." @@ -18187,11 +18219,11 @@ msgstr "Доступен" #: app/controllers/CControllerAuditLogList.php:169 #: app/partials/massupdate.macros.tab.php:125 #: app/partials/massupdate.valuemaps.tab.php:95 -#: app/partials/scheduledreport.formgrid.html.php:251 +#: app/partials/scheduledreport.formgrid.html.php:249 #: app/views/administration.authentication.edit.php:270 #: app/views/administration.autoreg.edit.php:90 #: app/views/administration.gui.edit.php:145 -#: app/views/administration.housekeeping.edit.php:183 +#: app/views/administration.housekeeping.edit.php:192 #: app/views/administration.iconmap.edit.php:136 #: app/views/administration.image.edit.php:77 #: app/views/administration.macros.edit.php:102 @@ -18206,7 +18238,7 @@ msgstr "Доступен" #: app/views/administration.user.edit.php:613 #: app/views/administration.user.edit.php:636 #: app/views/administration.usergroup.edit.php:221 -#: app/views/administration.userrole.edit.php:302 +#: app/views/administration.userrole.edit.php:292 #: app/views/administration.user.token.edit.php:88 #: app/views/configuration.correlation.edit.php:177 #: app/views/configuration.discovery.edit.php:154 @@ -18216,13 +18248,16 @@ msgstr "Доступен" #: app/views/popup.lldoperation.php:292 app/views/popup.lldoverride.php:220 #: app/views/popup.massupdate.host.php:323 #: app/views/popup.massupdate.item.php:511 +#: app/views/popup.massupdate.service.php:67 #: app/views/popup.massupdate.template.php:178 #: app/views/popup.massupdate.trigger.php:168 app/views/popup.media.php:127 -#: app/views/popup.mediatype.message.php:95 -#: app/views/popup.scheduledreport.subscription.php:134 -#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:128 +#: app/views/popup.mediatype.message.php:104 +#: app/views/popup.scheduledreport.subscription.php:133 +#: app/views/popup.service.edit.php:252 +#: app/views/popup.service.time.edit.php:155 +#: app/views/popup.triggerwizard.php:150 app/views/popup.valuemap.edit.php:126 #: include/classes/html/CTabFilter.php:94 -#: include/views/configuration.action.edit.php:489 +#: include/views/configuration.action.edit.php:492 #: include/views/configuration.graph.edit.php:494 #: include/views/configuration.host.discovery.edit.php:909 #: include/views/configuration.host.edit.php:535 @@ -18232,7 +18267,6 @@ msgstr "Доступен" #: include/views/configuration.item.edit.php:953 #: include/views/configuration.item.prototype.edit.php:810 #: include/views/configuration.maintenance.edit.php:264 -#: include/views/configuration.services.edit.php:373 #: include/views/configuration.template.edit.php:235 #: include/views/configuration.trigger.prototype.edit.php:653 #: include/views/configuration.triggers.edit.php:646 @@ -18254,7 +18288,7 @@ msgstr "Обновить существующее" #: app/views/popup.massupdate.item.php:285 disc_prototypes.php:62 #: host_discovery.php:64 host_discovery.php:229 #: include/views/configuration.host.discovery.edit.php:574 -#: include/views/configuration.host.discovery.list.php:138 +#: include/views/configuration.host.discovery.list.php:139 #: include/views/configuration.httpconf.edit.php:70 #: include/views/configuration.item.edit.php:665 #: include/views/configuration.item.prototype.edit.php:644 items.php:63 @@ -18262,7 +18296,7 @@ msgstr "Обновить существующее" msgid "Update interval" msgstr "Интервал обновления" -#: include/views/configuration.action.edit.php:469 +#: include/views/configuration.action.edit.php:472 msgid "Update operations" msgstr "Операции обновления" @@ -18288,9 +18322,9 @@ msgstr "Загрузить" msgid "Upper level maps" msgstr "Карты верхнего уровня" +#: app/partials/service.time.row.php:28 +#: app/views/popup.service.time.edit.php:45 #: include/classes/screens/CScreenDiscovery.php:120 -#: include/views/configuration.services.edit.php:187 -#: include/views/configuration.services.edit.php:244 msgid "Uptime" msgstr "Доступен" @@ -18318,8 +18352,8 @@ msgstr "Использовать, если важность" msgid "Use iframe sandboxing" msgstr "Использовать sandbox атрибут в iframe" -#: app/views/administration.mediatype.list.php:80 -#: app/views/administration.script.list.php:75 +#: app/views/administration.mediatype.list.php:81 +#: app/views/administration.script.list.php:76 msgid "Used in actions" msgstr "Использование в действиях" @@ -18330,9 +18364,9 @@ msgstr "Использование в действиях" #: app/views/administration.token.list.php:128 #: app/views/administration.token.view.php:37 #: app/views/administration.user.edit.php:244 -#: app/views/reports.auditlog.list.php:87 httpconf.php:67 -#: include/actions.inc.php:1623 include/actions.inc.php:1676 -#: include/actions.inc.php:1894 include/classes/setup/CSetupWizard.php:358 +#: app/views/reports.auditlog.list.php:88 httpconf.php:67 +#: include/actions.inc.php:1678 include/actions.inc.php:1731 +#: include/actions.inc.php:1949 include/classes/setup/CSetupWizard.php:358 #: include/hosts.inc.php:61 include/users.inc.php:52 #: include/views/configuration.httpconf.edit.php:165 msgid "User" @@ -18373,7 +18407,7 @@ msgstr "Пользователь \"%1$s\" используется в \"%2$s\" msgid "User \"%1$s\" is user on whose behalf report \"%2$s\" is created." msgstr "Пользователь \"%1$s\" является пользователем от имени которого создан \"%2$s\" шаблон." -#: include/actions.inc.php:1894 +#: include/actions.inc.php:1949 msgid "User action" msgstr "Действие пользователя" @@ -18395,7 +18429,7 @@ msgstr "Пользователь не может добавить себя в о msgid "User cannot change own role." msgstr "Пользователь не может изменить свою роль." -#: app/views/administration.userrole.edit.php:63 +#: app/views/administration.userrole.edit.php:62 #: include/classes/api/services/CRole.php:401 msgid "User cannot change the user type of own role." msgstr "Пользователь не может изменить тип пользователя собственной роли." @@ -18411,7 +18445,7 @@ msgstr[2] "Пользователи удалены" #: app/partials/js/scheduledreport.subscription.js.php:83 #: app/partials/popup.operations.php:85 #: app/views/administration.script.edit.php:242 -#: app/views/administration.script.list.php:79 +#: app/views/administration.script.list.php:80 #: app/views/administration.usergroup.edit.php:207 #: app/views/administration.user.list.php:43 msgid "User group" @@ -18484,8 +18518,8 @@ msgstr "Группа пользователей с ID \"%1$s\" недоступ #: app/views/administration.usergroup.edit.php:29 #: app/views/administration.usergroup.list.php:31 #: app/views/dashboard.share.edit.php:29 -#: include/classes/helpers/CMenuHelper.php:271 -#: include/classes/helpers/CRoleHelper.php:459 +#: include/classes/helpers/CMenuHelper.php:273 +#: include/classes/helpers/CRoleHelper.php:456 #: include/views/monitoring.sysmap.edit.php:322 msgid "User groups" msgstr "Группы пользователей" @@ -18524,9 +18558,9 @@ msgstr "Пароль пользователя" msgid "User profile" msgstr "Профиль пользователя" -#: app/views/administration.user.list.php:109 -#: app/views/administration.userrole.edit.php:312 -#: app/views/administration.userrole.edit.php:314 +#: app/views/administration.user.list.php:110 +#: app/views/administration.userrole.edit.php:301 +#: app/views/administration.userrole.edit.php:303 msgid "User role" msgstr "Роль пользователя" @@ -18556,20 +18590,20 @@ msgid "User role with name \"%1$s\" already exists." msgstr "Роль пользователя с названием \"%1$s\" уже существует." #: app/controllers/CControllerPopupGeneric.php:335 -#: app/views/administration.user.list.php:73 +#: app/views/administration.user.list.php:74 #: app/views/administration.userrole.edit.php:29 #: app/views/administration.userrole.list.php:31 -#: include/classes/helpers/CMenuHelper.php:276 -#: include/classes/helpers/CRoleHelper.php:460 +#: include/classes/helpers/CMenuHelper.php:278 +#: include/classes/helpers/CRoleHelper.php:457 msgid "User roles" msgstr "Роли пользователей" -#: app/views/administration.housekeeping.edit.php:112 +#: app/views/administration.housekeeping.edit.php:121 msgid "User sessions" msgstr "Сессии пользователей" -#: include/classes/helpers/CMenuHelper.php:369 -#: include/classes/helpers/CMenuHelper.php:383 +#: include/classes/helpers/CMenuHelper.php:371 +#: include/classes/helpers/CMenuHelper.php:385 msgid "User settings" msgstr "Настройки пользователя" @@ -18580,8 +18614,8 @@ msgid "User sharing is missing parameters: %1$s for map \"%2$s\"." msgstr "Общий доступ пользователям имеет отсутствующие параметры: %1$s у карты сети \"%2$s\"." #: app/views/administration.user.edit.php:377 -#: app/views/administration.userrole.edit.php:55 -#: app/views/administration.userrole.edit.php:70 +#: app/views/administration.userrole.edit.php:54 +#: app/views/administration.userrole.edit.php:69 msgid "User type" msgstr "Тип пользователя" @@ -18611,7 +18645,7 @@ msgstr "Пользователь с ID \"%1$s\" недоступен." msgid "User with username \"%1$s\" already exists." msgstr "Пользователь с именем пользователя \"%1$s\" уже существует." -#: include/actions.inc.php:1756 include/actions.inc.php:1839 +#: include/actions.inc.php:1811 include/actions.inc.php:1894 msgid "User/Recipient" msgstr "Пользователь/Получатель" @@ -18619,8 +18653,8 @@ msgstr "Пользователь/Получатель" #: app/views/administration.mediatype.edit.php:95 #: app/views/administration.script.edit.php:140 #: app/views/administration.user.edit.php:67 -#: app/views/administration.user.list.php:62 -#: app/views/administration.user.list.php:106 +#: app/views/administration.user.list.php:63 +#: app/views/administration.user.list.php:107 #: app/views/popup.massupdate.host.php:167 disc_prototypes.php:211 #: host_discovery.php:184 include/views/configuration.host.edit.php:341 #: include/views/configuration.host.prototype.edit.php:318 @@ -18645,16 +18679,16 @@ msgstr "Атрибут имени пользователя" #: app/views/administration.token.list.php:45 #: app/views/administration.user.edit.php:37 #: app/views/administration.usergroup.edit.php:50 -#: app/views/administration.usergroup.list.php:193 -#: app/views/administration.usergroup.list.php:198 +#: app/views/administration.usergroup.list.php:194 +#: app/views/administration.usergroup.list.php:199 #: app/views/administration.user.list.php:34 -#: app/views/administration.userrole.list.php:67 -#: app/views/administration.userrole.list.php:109 -#: app/views/administration.userrole.list.php:115 +#: app/views/administration.userrole.list.php:68 +#: app/views/administration.userrole.list.php:110 +#: app/views/administration.userrole.list.php:116 #: app/views/dashboard.share.edit.php:50 -#: app/views/reports.auditlog.list.php:47 -#: include/classes/helpers/CMenuHelper.php:281 -#: include/classes/helpers/CRoleHelper.php:461 +#: app/views/reports.auditlog.list.php:48 +#: include/classes/helpers/CMenuHelper.php:283 +#: include/classes/helpers/CRoleHelper.php:458 #: include/views/monitoring.sysmap.edit.php:359 msgid "Users" msgstr "Пользователи" @@ -18918,21 +18952,23 @@ msgstr "Валидация" #: app/views/administration.script.edit.php:65 #: app/views/monitoring.widget.plaintext.view.php:50 #: app/views/popup.condition.common.php:141 -#: app/views/popup.condition.common.php:320 -#: app/views/popup.condition.common.php:367 -#: app/views/popup.condition.common.php:382 -#: app/views/popup.condition.common.php:530 -#: app/views/popup.condition.common.php:544 -#: app/views/popup.condition.common.php:575 -#: app/views/popup.condition.common.php:594 app/views/popup.httpstep.php:70 +#: app/views/popup.condition.common.php:328 +#: app/views/popup.condition.common.php:375 +#: app/views/popup.condition.common.php:390 +#: app/views/popup.condition.common.php:538 +#: app/views/popup.condition.common.php:552 +#: app/views/popup.condition.common.php:583 +#: app/views/popup.condition.common.php:604 app/views/popup.httpstep.php:70 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120 -#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:261 +#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263 #: app/views/popup.lldoperation.php:270 #: app/views/popup.massupdate.host.php:207 #: app/views/popup.massupdate.item.php:120 #: app/views/popup.massupdate.item.php:486 +#: app/views/popup.massupdate.service.php:50 #: app/views/popup.massupdate.template.php:140 #: app/views/popup.massupdate.trigger.php:87 +#: app/views/popup.service.edit.php:82 app/views/popup.service.edit.php:183 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51 #: include/blocks.inc.php:530 include/classes/graphdraw/CPieGraphDraw.php:309 #: include/classes/screens/CScreenHistory.php:279 @@ -18949,7 +18985,7 @@ msgstr "Валидация" #: include/views/configuration.item.prototype.edit.php:184 #: include/views/configuration.item.prototype.edit.php:322 #: include/views/configuration.triggers.list.php:91 -#: include/views/configuration.triggers.list.php:185 +#: include/views/configuration.triggers.list.php:186 #: include/views/monitoring.history.php:161 #: include/views/monitoring.history.php:293 #, c-format @@ -19042,7 +19078,7 @@ msgstr "Значение тега нового события" msgid "Value of old event tag" msgstr "Значение тега старого события" -#: include/actions.inc.php:329 +#: include/actions.inc.php:352 msgid "Value of tag" msgstr "Значение тега" @@ -19085,7 +19121,7 @@ msgstr "API endpoint Хранилища" msgid "Vault authentication token" msgstr "Токен аутентификации Хранилища" -#: include/classes/core/ZBase.php:235 +#: include/classes/core/ZBase.php:234 #: include/classes/setup/CSetupWizard.php:899 include/config.inc.php:53 msgid "Vault connection failed." msgstr "Ошибка подключения к Хранилищу." @@ -19112,7 +19148,7 @@ msgid "Verify database certificate" msgstr "Удостоверять сертификат базы данных" #: app/views/administration.module.edit.php:39 -#: app/views/administration.module.list.php:74 +#: app/views/administration.module.list.php:75 msgid "Version" msgstr "Версия" @@ -19139,6 +19175,8 @@ msgstr "Выравнивание по вертикали" msgid "Vietnamese (vi_VN)" msgstr "Вьетнамский (vi_VN)" +#: app/views/monitoring.service.list.edit.php:203 +#: app/views/monitoring.service.list.php:167 #: include/views/js/configuration.host.discovery.edit.overr.js.php:106 msgid "View" msgstr "Просмотр" @@ -19165,7 +19203,7 @@ msgstr "Видимое имя" msgid "Visible name cannot be empty if host name is missing." msgstr "Видимое имя не может быть пустым, если имя узла сети не заполнено." -#: jsLoader.php:244 +#: jsLoader.php:242 msgctxt "Wednesday short" msgid "W" msgstr "Ср" @@ -19182,11 +19220,11 @@ msgctxt "setup" msgid "Warning" msgstr "Предупреждение" -#: jsLoader.php:219 +#: jsLoader.php:217 msgid "Warning message" msgstr "Предупреждающее сообщение" -#: jsLoader.php:291 +#: jsLoader.php:289 msgid "We are sorry, the maximum possible number of elements to remember has been reached." msgstr "Приносим свои извинения, достигнуто максимально возможное количество элементов." @@ -19202,7 +19240,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:362 +#: include/views/inventory.host.view.php:219 jsLoader.php:360 msgid "Web" msgstr "Веб" @@ -19210,7 +19248,7 @@ msgstr "Веб" #: app/views/monitoring.web.view.php:38 #: include/classes/widgets/CWidgetConfig.php:64 include/items.inc.php:101 #: include/views/configuration.httpconf.edit.php:26 -#: include/views/configuration.httpconf.list.php:91 +#: include/views/configuration.httpconf.list.php:92 msgid "Web monitoring" msgstr "Веб-мониторинг" @@ -19262,7 +19300,7 @@ msgid "Web scenarios" msgstr "Веб-сценарии" #: app/views/administration.script.edit.php:115 -#: app/views/administration.script.list.php:151 include/media.inc.php:27 +#: app/views/administration.script.list.php:152 include/media.inc.php:27 msgid "Webhook" msgstr "Webhook" @@ -19274,14 +19312,14 @@ msgstr "Webhook не содержит параметров." msgid "Wed" msgstr "Ср" -#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:237 +#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235 msgid "Wednesday" msgstr "Среда" #: app/partials/scheduledreport.formgrid.html.php:103 #: app/partials/scheduledreport.table.html.php:50 -#: app/views/popup.maintenance.period.php:77 app/views/report.services.php:45 -#: include/maintenances.inc.php:29 report4.php:89 +#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29 +#: report4.php:89 msgid "Weekly" msgstr "Еженедельно" @@ -19302,7 +19340,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:186 +#: jsLoader.php:184 msgid "Widget is too small for the specified number of columns and rows." msgstr "Виджет слишком маленький для указанного количества колонок и строк." @@ -19320,17 +19358,17 @@ msgstr "Виджет слишком маленький для указанног #: include/classes/widgets/CWidgetHelper.php:784 #: include/classes/widgets/CWidgetHelper.php:1042 #: include/views/configuration.graph.edit.php:96 -#: include/views/configuration.graph.list.php:150 +#: include/views/configuration.graph.list.php:151 #: include/views/js/monitoring.sysmaps.js.php:117 #: include/views/js/monitoring.sysmaps.js.php:418 #: include/views/js/monitoring.sysmaps.js.php:460 #: include/views/monitoring.sysmap.edit.php:100 -#: include/views/monitoring.sysmap.list.php:66 sysmaps.php:40 +#: include/views/monitoring.sysmap.list.php:67 sysmaps.php:40 msgid "Width" msgstr "Ширина" #: include/views/configuration.maintenance.edit.php:104 -#: include/views/configuration.maintenance.list.php:110 +#: include/views/configuration.maintenance.list.php:111 msgid "With data collection" msgstr "Со cбором данных" @@ -19374,7 +19412,7 @@ msgid "Working time" msgstr "Рабочее время" #: app/views/administration.script.edit.php:246 -#: app/views/administration.script.list.php:188 +#: app/views/administration.script.list.php:189 msgid "Write" msgstr "Запись" @@ -19383,11 +19421,6 @@ msgstr "Запись" msgid "Wrong Module.php class name for module located at %1$s." msgstr "Ошибочное имя класса Module.php для модуля расположенного в %1$s." -#: include/classes/api/services/CService.php:415 -#, c-format -msgid "Wrong fields for dependency for service \"%1$s\"." -msgstr "Ошибочные поля для зависимости услуги \"%1$s\"." - #: include/classes/api/services/CHost.php:1911 #: include/classes/api/services/CHost.php:2110 #, c-format @@ -19404,17 +19437,6 @@ msgstr "Ошибочные поля для макроса \"%1$s\"." msgid "Wrong fields for map link." msgstr "Ошибочные поля для связи на карте сети." -#: include/classes/api/services/CService.php:135 -#: include/classes/api/services/CService.php:249 -#, c-format -msgid "Wrong fields for service \"%1$s\"." -msgstr "Ошибочные поля для услуги \"%1$s\"." - -#: include/classes/api/services/CService.php:495 -#, c-format -msgid "Wrong fields for time for service \"%1$s\"." -msgstr "Ошибочные поля для времени услуги \"%1$s\"." - #: include/classes/api/services/CMapElement.php:74 #: include/classes/api/services/CMap.php:977 #: include/classes/api/services/CMap.php:1452 @@ -19531,16 +19553,16 @@ msgstr "Y2" msgid "YAML" msgstr "YAML" -#: app/partials/scheduledreport.formgrid.html.php:160 -#: app/partials/scheduledreport.formgrid.html.php:169 +#: app/partials/scheduledreport.formgrid.html.php:159 +#: app/partials/scheduledreport.formgrid.html.php:168 msgid "YYYY-MM-DD" msgstr "ГГГГ-ММ-ДД" #: app/views/popup.maintenance.period.php:150 +#: app/views/popup.service.time.edit.php:128 +#: app/views/popup.service.time.edit.php:136 #: include/views/configuration.maintenance.edit.php:113 #: include/views/configuration.maintenance.edit.php:120 -#: include/views/configuration.services.edit.php:262 -#: include/views/configuration.services.edit.php:269 msgid "YYYY-MM-DD hh:mm" msgstr "YYYY-MM-DD hh:mm" @@ -19559,45 +19581,44 @@ msgstr "ГГГГ-ММ-ДД чч:мм:сс" #: include/classes/import/validators/C50XmlValidator.php:1864 #: include/classes/import/validators/C52XmlValidator.php:1986 #: include/classes/import/validators/C54XmlValidator.php:2041 +#: include/classes/import/validators/C60XmlValidator.php:2042 msgctxt "XML date and time format" msgid "YYYY-MM-DDThh:mm:ssZ" msgstr "YYYY-MM-DDThh:mm:ssZ" -#: app/views/report.services.php:57 app/views/report.services.php:80 #: report4.php:116 report4.php:152 msgid "Year" msgstr "Год" #: app/partials/scheduledreport.formgrid.html.php:105 -#: app/partials/scheduledreport.table.html.php:52 -#: app/views/report.services.php:47 report4.php:91 +#: app/partials/scheduledreport.table.html.php:52 report4.php:91 msgid "Yearly" msgstr "Ежегодно" #: app/partials/configuration.filter.items.php:194 #: app/partials/configuration.filter.items.php:201 #: app/partials/configuration.filter.items.php:210 -#: app/views/administration.user.list.php:133 app/views/hint.box.php:179 +#: app/views/administration.user.list.php:134 app/views/hint.box.php:179 #: app/views/hint.box.php:183 #: app/views/monitoring.widget.problems.view.php:264 #: app/views/monitoring.widget.problems.view.php:268 -#: app/views/popup.condition.common.php:648 +#: app/views/popup.condition.common.php:683 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96 #: app/views/popup.massupdate.item.php:327 #: app/views/popup.massupdate.item.php:336 #: app/views/popup.massupdate.item.php:378 #: app/views/popup.massupdate.trigger.php:68 include/actions.inc.php:32 #: include/blocks.inc.php:537 include/blocks.inc.php:844 -#: include/blocks.inc.php:848 include/classes/screens/CScreenProblem.php:1106 -#: include/classes/screens/CScreenProblem.php:1110 -#: include/classes/screens/CScreenProblem.php:1252 include/events.inc.php:195 -#: include/events.inc.php:199 include/events.inc.php:394 -#: include/events.inc.php:398 include/triggers.inc.php:1172 +#: include/blocks.inc.php:848 include/classes/screens/CScreenProblem.php:1107 +#: include/classes/screens/CScreenProblem.php:1111 +#: include/classes/screens/CScreenProblem.php:1253 include/events.inc.php:198 +#: include/events.inc.php:202 include/events.inc.php:397 +#: include/events.inc.php:401 include/triggers.inc.php:1172 #: include/triggers.inc.php:1177 -#: include/views/configuration.graph.list.php:205 +#: include/views/configuration.graph.list.php:206 #: include/views/configuration.host.prototype.list.php:142 #: include/views/configuration.host.prototype.list.php:158 -#: include/views/configuration.httpconf.list.php:187 +#: include/views/configuration.httpconf.list.php:188 #: include/views/configuration.item.prototype.list.php:117 #: include/views/configuration.item.prototype.list.php:153 #: include/views/configuration.trigger.prototype.list.php:131 @@ -19632,7 +19653,7 @@ msgstr "Вы не выполнили вход" msgid "You can not switch hosts for current selection." msgstr "Вы не можете переключить узлы сети для текущего выбора." -#: include/classes/api/services/CAction.php:1788 +#: include/classes/api/services/CAction.php:1808 #, c-format msgid "You did not specify targets for action operation global script \"%1$s\"." msgstr "Вы не указали цели для глобального скрипта \"%1$s\" операции действия." @@ -19694,11 +19715,11 @@ msgstr "ZABBIX" msgid "Zabbix" msgstr "Zabbix" -#: include/classes/helpers/CMenuHelper.php:342 +#: include/classes/helpers/CMenuHelper.php:344 msgid "Zabbix Share" msgstr "Zabbix Share" -#: include/classes/helpers/CMenuHelper.php:335 +#: include/classes/helpers/CMenuHelper.php:337 msgid "Zabbix Technical Support" msgstr "Техническая Поддержка Zabbix" @@ -19789,29 +19810,29 @@ msgstr "[Ошибочное значение для дня: \"%1$s\" ]" msgid "[Wrong value for month: \"%1$s\" ]" msgstr "[Ошибочное значение для месяца: \"%1$s\" ]" -#: include/classes/validators/CApiInputValidator.php:1971 +#: include/classes/validators/CApiInputValidator.php:2001 msgid "a DNS name is expected" msgstr "ожидается DNS имя" -#: include/classes/validators/CApiInputValidator.php:904 +#: include/classes/validators/CApiInputValidator.php:934 msgid "a boolean is expected" msgstr "ожидается логическое" #: include/classes/api/services/CUser.php:846 #: include/classes/import/validators/CXmlValidatorGeneral.php:269 -#: include/classes/validators/CActionCondValidator.php:184 +#: include/classes/validators/CActionCondValidator.php:186 #: include/classes/validators/CApiInputValidator.php:302 #: include/classes/validators/CEventCorrCondValidator.php:91 #: include/classes/validators/CNewValidator.php:326 msgid "a character string is expected" msgstr "ожидается строка символов" -#: include/classes/validators/CApiInputValidator.php:2185 +#: include/classes/validators/CApiInputValidator.php:2215 msgid "a date in YYYY-MM-DD format is expected" msgstr "ожидается дата в ГГГГ-ММ-ДД формате" #: app/controllers/CControllerPopupValueMapUpdate.php:125 -#: include/classes/validators/CApiInputValidator.php:684 +#: include/classes/validators/CApiInputValidator.php:685 msgid "a floating point value is expected" msgstr "ожидается значение с плавающей точкой" @@ -19820,28 +19841,28 @@ msgstr "ожидается значение с плавающей точкой" msgid "a hexadecimal colour code (6 symbols) is expected" msgstr "ожидается код цвета в шестнадцатеричном формате (6 символов)" -#: include/classes/validators/CApiInputValidator.php:1500 +#: include/classes/validators/CApiInputValidator.php:1530 msgid "a low-level discovery macro is expected" msgstr "ожидается макрос низкоуровневого обнаружения" -#: include/classes/validators/CApiInputValidator.php:1381 +#: include/classes/validators/CApiInputValidator.php:1411 #: include/validate.inc.php:194 msgid "a number has too many fractional digits" msgstr "у числа слишком много десятичных точек" -#: include/classes/validators/CApiInputValidator.php:858 -#: include/classes/validators/CApiInputValidator.php:1360 -#: include/classes/validators/CApiInputValidator.php:1994 +#: include/classes/validators/CApiInputValidator.php:888 +#: include/classes/validators/CApiInputValidator.php:1390 +#: include/classes/validators/CApiInputValidator.php:2024 #: include/validate.inc.php:175 msgid "a number is expected" msgstr "ожидается число" #: include/classes/validators/CApiInputValidator.php:545 #: include/classes/validators/CApiInputValidator.php:584 -#: include/classes/validators/CApiInputValidator.php:868 -#: include/classes/validators/CApiInputValidator.php:1369 -#: include/classes/validators/CApiInputValidator.php:1376 -#: include/classes/validators/CApiInputValidator.php:1667 +#: include/classes/validators/CApiInputValidator.php:898 +#: include/classes/validators/CApiInputValidator.php:1399 +#: include/classes/validators/CApiInputValidator.php:1406 +#: include/classes/validators/CApiInputValidator.php:1697 #: include/validate.inc.php:183 include/validate.inc.php:189 msgid "a number is too large" msgstr "число слишком большое" @@ -19858,7 +19879,7 @@ msgstr "ожидается цифровое значение" msgid "a relative time is expected" msgstr "ожидается относительное время" -#: include/classes/validators/CApiInputValidator.php:2155 +#: include/classes/validators/CApiInputValidator.php:2185 msgid "a string, number or null value is expected" msgstr "ожидается строка, число или отсутствие значения" @@ -19866,25 +19887,25 @@ msgstr "ожидается строка, число или отсутствие msgid "a time is expected" msgstr "ожидается время" -#: include/classes/validators/CApiInputValidator.php:1567 +#: include/classes/validators/CApiInputValidator.php:1597 #: include/classes/validators/CNewValidator.php:285 msgid "a time period is expected" msgstr "ожидается период времени" -#: include/classes/validators/CApiInputValidator.php:1533 +#: include/classes/validators/CApiInputValidator.php:1563 #: 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:1656 +#: include/classes/validators/CApiInputValidator.php:1686 #: include/classes/validators/CNewValidator.php:524 #: include/validate.inc.php:213 include/validate.inc.php:594 msgid "a time unit is expected" msgstr "ожидается единица времени" -#: include/classes/validators/CApiInputValidator.php:1471 +#: include/classes/validators/CApiInputValidator.php:1501 msgid "a user macro is expected" msgstr "ожидается пользовательский макрос" @@ -19913,9 +19934,9 @@ msgstr "агент" #: app/partials/configuration.filter.items.php:209 #: include/classes/graphdraw/CLineGraphDraw.php:1397 #: include/classes/html/CSeverity.php:73 -#: include/views/configuration.host.discovery.list.php:111 -#: include/views/configuration.host.discovery.list.php:155 -#: include/views/configuration.host.discovery.list.php:164 +#: include/views/configuration.host.discovery.list.php:112 +#: include/views/configuration.host.discovery.list.php:156 +#: include/views/configuration.host.discovery.list.php:165 #: include/views/configuration.httpconf.list.php:71 #: include/views/configuration.triggers.list.php:75 #: include/views/configuration.triggers.list.php:84 @@ -19928,11 +19949,11 @@ msgstr "агент" msgid "all" msgstr "все" -#: include/actions.inc.php:563 include/actions.inc.php:732 +#: include/actions.inc.php:586 include/actions.inc.php:764 msgid "all media" msgstr "все способы оповещения" -#: include/classes/validators/CApiInputValidator.php:1928 +#: include/classes/validators/CApiInputValidator.php:1958 msgid "an IP address is expected" msgstr "ожидается IP адрес" @@ -19955,23 +19976,27 @@ msgstr "ожидается IP адрес" #: include/classes/import/validators/C54XmlValidator.php:2476 #: include/classes/import/validators/C54XmlValidator.php:2561 #: include/classes/import/validators/C54XmlValidator.php:2600 +#: include/classes/import/validators/C60XmlValidator.php:2457 +#: include/classes/import/validators/C60XmlValidator.php:2477 +#: 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:493 #: include/classes/validators/CApiInputValidator.php:625 -#: include/classes/validators/CApiInputValidator.php:718 -#: include/classes/validators/CApiInputValidator.php:812 -#: include/classes/validators/CApiInputValidator.php:959 -#: include/classes/validators/CApiInputValidator.php:1153 -#: include/classes/validators/CApiInputValidator.php:1196 +#: include/classes/validators/CApiInputValidator.php:723 +#: include/classes/validators/CApiInputValidator.php:842 +#: include/classes/validators/CApiInputValidator.php:989 +#: include/classes/validators/CApiInputValidator.php:1183 +#: include/classes/validators/CApiInputValidator.php:1226 msgid "an array is expected" msgstr "ожидается массив" -#: include/classes/validators/CApiInputValidator.php:1038 -#: include/classes/validators/CApiInputValidator.php:1108 +#: include/classes/validators/CApiInputValidator.php:1068 +#: include/classes/validators/CApiInputValidator.php:1138 msgid "an array or a character string is expected" msgstr "ожидается массив или строка символов" -#: include/classes/validators/CApiInputValidator.php:2135 +#: include/classes/validators/CApiInputValidator.php:2165 msgid "an array or object is expected" msgstr "ожидается массив или объект" @@ -19981,7 +20006,7 @@ msgid "an empty string is expected" msgstr "ожидается пустая строка" #: include/classes/api/services/CHost.php:1848 -#: include/classes/validators/CApiInputValidator.php:1071 +#: include/classes/validators/CApiInputValidator.php:1101 msgid "an even number of hexadecimal characters is expected" msgstr "ожидается четное количество шестнадцатеричных символов" @@ -20046,7 +20071,7 @@ msgstr "atan() - Арктангенс значения в виде угла, в msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians" msgstr "atan2() - Арктангенс координат ординаты (exprue) и абсциссы, заданный углом, в радианах." -#: include/events.inc.php:62 +#: include/events.inc.php:63 msgid "autoregistered host" msgstr "автоматически зарегистрированный узел сети" @@ -20149,7 +20174,7 @@ msgstr "нельзя изменить" #: app/controllers/CControllerUsergroupTagfilterAdd.php:41 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47 #: app/controllers/CControllerUserUpdateGeneral.php:111 -#: include/classes/api/services/CAction.php:1773 +#: include/classes/api/services/CAction.php:1793 #: include/classes/api/services/CAutoregistration.php:156 #: include/classes/api/services/CCorrelation.php:1052 #: include/classes/api/services/CCorrelation.php:1087 @@ -20164,12 +20189,12 @@ msgstr "нельзя изменить" #: include/classes/api/services/CDRule.php:352 #: include/classes/api/services/CDRule.php:364 #: include/classes/api/services/CDRule.php:547 -#: include/classes/api/services/CEvent.php:819 +#: include/classes/api/services/CEvent.php:820 #: include/classes/api/services/CHost.php:1836 #: include/classes/api/services/CHost.php:1842 -#: include/classes/api/services/CHostPrototype.php:1678 -#: include/classes/api/services/CHostPrototype.php:1690 -#: include/classes/api/services/CHostPrototype.php:1706 +#: include/classes/api/services/CHostPrototype.php:1683 +#: include/classes/api/services/CHostPrototype.php:1695 +#: include/classes/api/services/CHostPrototype.php:1711 #: include/classes/api/services/CItemGeneral.php:481 #: include/classes/api/services/CItemGeneral.php:508 #: include/classes/api/services/CItemGeneral.php:514 @@ -20207,27 +20232,27 @@ msgstr "нельзя изменить" #: include/classes/import/CConfigurationImport.php:961 #: include/classes/import/CConfigurationImport.php:1115 #: include/classes/import/CConfigurationImport.php:2799 -#: include/classes/validators/CActionCondValidator.php:65 -#: include/classes/validators/CActionCondValidator.php:71 -#: include/classes/validators/CActionCondValidator.php:82 -#: include/classes/validators/CActionCondValidator.php:90 -#: include/classes/validators/CActionCondValidator.php:109 -#: include/classes/validators/CActionCondValidator.php:118 -#: include/classes/validators/CActionCondValidator.php:127 -#: include/classes/validators/CActionCondValidator.php:136 -#: include/classes/validators/CActionCondValidator.php:151 -#: include/classes/validators/CActionCondValidator.php:160 -#: include/classes/validators/CActionCondValidator.php:174 -#: include/classes/validators/CActionCondValidator.php:180 -#: include/classes/validators/CActionCondValidator.php:190 +#: include/classes/validators/CActionCondValidator.php:66 +#: include/classes/validators/CActionCondValidator.php:72 +#: include/classes/validators/CActionCondValidator.php:83 +#: include/classes/validators/CActionCondValidator.php:91 +#: include/classes/validators/CActionCondValidator.php:110 +#: include/classes/validators/CActionCondValidator.php:119 +#: include/classes/validators/CActionCondValidator.php:128 +#: include/classes/validators/CActionCondValidator.php:137 +#: include/classes/validators/CActionCondValidator.php:152 +#: include/classes/validators/CActionCondValidator.php:161 +#: include/classes/validators/CActionCondValidator.php:176 +#: include/classes/validators/CActionCondValidator.php:182 +#: include/classes/validators/CActionCondValidator.php:192 #: include/classes/validators/CApiInputValidator.php:312 #: include/classes/validators/CApiInputValidator.php:498 #: include/classes/validators/CApiInputValidator.php:630 -#: include/classes/validators/CApiInputValidator.php:723 -#: include/classes/validators/CApiInputValidator.php:817 -#: include/classes/validators/CApiInputValidator.php:863 -#: include/classes/validators/CApiInputValidator.php:1158 -#: include/classes/validators/CApiInputValidator.php:1201 +#: include/classes/validators/CApiInputValidator.php:728 +#: include/classes/validators/CApiInputValidator.php:847 +#: include/classes/validators/CApiInputValidator.php:893 +#: include/classes/validators/CApiInputValidator.php:1188 +#: include/classes/validators/CApiInputValidator.php:1231 #: include/classes/validators/CEventCorrCondValidator.php:55 #: include/classes/validators/CEventCorrCondValidator.php:61 #: include/classes/validators/CEventCorrCondValidator.php:67 @@ -20282,7 +20307,7 @@ msgstr "закольцованная зависимость не разреше msgid "circular item dependency is not allowed" msgstr "закольцованная зависимость элементов данных не разрешена" -#: jsLoader.php:294 +#: jsLoader.php:292 msgid "colour" msgstr "цвет" @@ -20300,7 +20325,7 @@ msgid "configure" msgstr "настройка" #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26 -#: include/correlation.inc.php:33 include/views/inventory.host.list.php:68 +#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171 msgid "contains" msgstr "содержит" @@ -20329,12 +20354,12 @@ msgstr "count() - Количество успешно полученных зн msgid "countunique() - The number of unique values" msgstr "countunique() - Количество уникальных значений" -#: include/func.inc.php:579 jsLoader.php:213 +#: include/func.inc.php:579 jsLoader.php:211 msgctxt "day short" msgid "d" msgstr "д" -#: chart4.php:129 chart5.php:143 +#: chart4.php:129 msgid "d.M" msgstr "d.M" @@ -20350,7 +20375,7 @@ msgstr "dayofmonth() - День месяца" msgid "dayofweek() - Day of week" msgstr "dayofweek() - День недели" -#: app/partials/common.filter.trigger.php:115 +#: app/partials/common.filter.trigger.php:116 #: app/partials/monitoring.problem.filter.php:124 #: app/views/administration.token.list.php:72 #: app/views/administration.user.token.list.php:54 @@ -20391,15 +20416,15 @@ msgstr "по убыванию" msgid "description" msgstr "описание" -#: include/classes/validators/CApiInputValidator.php:1440 +#: include/classes/validators/CApiInputValidator.php:1470 msgid "directory cannot be empty" msgstr "папка не может быть пустой" -#: include/events.inc.php:60 +#: include/events.inc.php:61 msgid "discovered host" msgstr "обнаруженный узел сети" -#: include/events.inc.php:61 +#: include/events.inc.php:62 msgid "discovered service" msgstr "обнаруженный сервис" @@ -20446,7 +20471,7 @@ msgstr "e() - Возвращает число Эйлера" #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78 #: include/actions.inc.php:24 include/correlation.inc.php:31 -#: include/views/inventory.host.list.php:69 +#: include/views/inventory.host.list.php:70 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169 msgid "equals" msgstr "равно" @@ -20455,7 +20480,7 @@ msgstr "равно" msgid "error message" msgstr "сообщение об ошибке" -#: include/classes/api/services/CAction.php:1676 +#: include/classes/api/services/CAction.php:1692 msgid "esc_step_from and esc_step_to must be set together." msgstr "esc_step_from и esc_step_to должны устанавливаться одновременно." @@ -20524,17 +20549,17 @@ msgctxt "item_form" msgid "global housekeeping settings" msgstr "глобальные настройки очистки истории" -#: app/views/monitoring.charts.view.php:140 +#: app/views/monitoring.charts.view.php:141 msgid "graph pattern" msgstr "шаблон графиков" -#: include/func.inc.php:580 jsLoader.php:214 +#: include/func.inc.php:580 jsLoader.php:212 msgctxt "hour short" msgid "h" msgstr "ч" -#: include/views/configuration.services.edit.php:288 -#: include/views/configuration.services.edit.php:298 +#: app/views/popup.service.time.edit.php:73 +#: app/views/popup.service.time.edit.php:99 msgid "hh" msgstr "чч" @@ -20677,11 +20702,11 @@ msgstr "недопустимый четвертый параметр в функ msgid "invalid history storage period" msgstr "недопустимый период хранения истории" -#: include/classes/validators/CApiInputValidator.php:1260 +#: include/classes/validators/CApiInputValidator.php:1290 msgid "invalid host group name" msgstr "ошибочное имя группы узлов сети" -#: include/classes/validators/CApiInputValidator.php:1304 +#: include/classes/validators/CApiInputValidator.php:1334 msgid "invalid host name" msgstr "ошибочное имя узла сети" @@ -20692,12 +20717,12 @@ msgid "invalid number of parameters in function \"%1$s\"" msgstr "недопустимое количество параметров в функции \"%1$s\"" #: app/controllers/CControllerPopupValueMapUpdate.php:117 -#: include/classes/validators/CApiInputValidator.php:2233 +#: include/classes/validators/CApiInputValidator.php:2263 msgid "invalid range expression" msgstr "недопустимое выражение диапазона" #: app/controllers/CControllerPopupValueMapUpdate.php:105 -#: include/classes/validators/CApiInputValidator.php:1603 +#: include/classes/validators/CApiInputValidator.php:1633 msgid "invalid regular expression" msgstr "ошибочное регулярное выражение" @@ -20725,11 +20750,11 @@ msgstr "больше чем или равно" msgid "is less than or equals" msgstr "меньше чем или равно" -#: include/classes/validators/CApiInputValidator.php:1847 +#: include/classes/validators/CApiInputValidator.php:1877 msgid "is not enclosed in {} or is malformed" msgstr "не заключено в {} или ошибочно" -#: include/events.inc.php:63 +#: include/events.inc.php:64 msgid "item" msgstr "элемент данных" @@ -20803,7 +20828,7 @@ msgstr "logseverity() - Важность журнала последней за msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)" msgstr "logsource() - Соответствие источника журнала последней записи журнала параметру V за период Е (1 - соответствует, 0 - не соответствует)" -#: include/events.inc.php:64 +#: include/events.inc.php:65 msgid "low-level discovery rule" msgstr "правило низкоуровневого обнаружения" @@ -20811,12 +20836,12 @@ msgstr "правило низкоуровневого обнаружения" msgid "ltrim() - Remove specified characters from the beginning of a string" msgstr "ltrim() - Удаление указанных символов с начала строки" -#: include/func.inc.php:581 jsLoader.php:140 jsLoader.php:215 jsLoader.php:379 +#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377 msgctxt "minute short" msgid "m" msgstr "м" -#: include/func.inc.php:578 jsLoader.php:212 +#: include/func.inc.php:578 jsLoader.php:210 msgctxt "month short" msgid "m" msgstr "м" @@ -20915,13 +20940,13 @@ msgid "min() - Minimum value for period T" msgstr "min() - Минимальное значение за период Т" #: include/classes/api/services/CHost.php:1854 -#: include/classes/validators/CApiInputValidator.php:1065 +#: include/classes/validators/CApiInputValidator.php:1095 #, c-format msgid "minimum length is %1$s characters" msgstr "минимальная длина %1$s символов" -#: include/views/configuration.services.edit.php:293 -#: include/views/configuration.services.edit.php:303 +#: app/views/popup.service.time.edit.php:81 +#: app/views/popup.service.time.edit.php:107 msgid "mm" msgstr "мм" @@ -20934,7 +20959,7 @@ msgctxt "millisecond short" msgid "ms" msgstr "мс" -#: include/classes/validators/CApiInputValidator.php:2258 +#: include/classes/validators/CApiInputValidator.php:2288 #, c-format msgid "must be %1$s characters long" msgstr "должно быть %1$s символа" @@ -20956,8 +20981,8 @@ msgstr "должен быть действительным пользовате msgid "must be between \"%1$s\" and \"%2$s\"" msgstr "должно быть между \"%1$s\" и \"%2$s\"" -#: include/classes/validators/CApiInputValidator.php:1267 -#: include/classes/validators/CApiInputValidator.php:1311 +#: include/classes/validators/CApiInputValidator.php:1297 +#: include/classes/validators/CApiInputValidator.php:1341 msgid "must contain at least one low-level discovery macro" msgstr "должно содержать по крайней мере один макрос низкоуровневого обнаружения" @@ -20971,7 +20996,7 @@ msgstr "должно содержать по крайней мере один м msgid "name" msgstr "название" -#: include/classes/html/CMultiSelect.php:85 jsLoader.php:316 +#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314 msgid "new" msgstr "новый" @@ -20985,19 +21010,19 @@ msgstr "новый" msgid "no data" msgstr "нет данных" -#: include/classes/api/services/CEvent.php:772 +#: include/classes/api/services/CEvent.php:773 msgid "no permissions to acknowledge problems" msgstr "нет прав для подтверждения проблем" -#: include/classes/api/services/CEvent.php:761 +#: include/classes/api/services/CEvent.php:762 msgid "no permissions to add problem comments" msgstr "нет прав оставлять комментарии к проблемам" -#: include/classes/api/services/CEvent.php:766 +#: include/classes/api/services/CEvent.php:767 msgid "no permissions to change problem severity" msgstr "отсутствуют права доступа на изменение важности проблем" -#: include/classes/api/services/CEvent.php:756 +#: include/classes/api/services/CEvent.php:757 msgid "no permissions to close problems" msgstr "нет прав закрывать проблемы" @@ -21005,7 +21030,7 @@ msgstr "нет прав закрывать проблемы" msgid "no permissions to create and edit maps" msgstr "нет прав создавать и редактировать карты" -#: include/classes/api/services/CEvent.php:773 +#: include/classes/api/services/CEvent.php:774 msgid "no permissions to unacknowledge problems" msgstr "нет прав отменять подтверждение проблем" @@ -21106,7 +21131,7 @@ msgstr "вывод" msgid "path/to/secret" msgstr "путь/к/секрету" -#: include/classes/html/CMacroValue.php:139 jsLoader.php:390 +#: include/classes/html/CMacroValue.php:139 jsLoader.php:388 msgid "path/to/secret:key" msgstr "путь/к/секрету:ключ" @@ -21185,13 +21210,6 @@ msgstr "справа" msgid "right() - Returns the rightmost count characters" msgstr "right() - Возвращает количество самых правых символов" -#: app/views/popup.services.php:59 app/views/popup.services.php:62 -#: app/views/popup.services.php:64 app/views/popup.services.php:65 -#: include/services.inc.php:72 include/services.inc.php:75 -#: include/services.inc.php:163 -msgid "root" -msgstr "root" - #: app/controllers/CControllerPopupTriggerExpr.php:857 msgid "round() - Rounds a value to decimal places" msgstr "round() - Округление значение до десятичных знаков" @@ -21240,7 +21258,11 @@ msgstr "секунды" msgid "selected" msgstr "выбрано" -#: include/views/configuration.services.edit.php:256 +#: include/events.inc.php:38 include/events.inc.php:66 +msgid "service" +msgstr "" + +#: app/views/popup.service.time.edit.php:121 msgid "short description" msgstr "краткое описание" @@ -21249,7 +21271,7 @@ msgstr "краткое описание" #: include/classes/api/services/CHost.php:1867 #: include/classes/api/services/CHost.php:1876 #: include/classes/api/services/CHost.php:1882 -#: include/classes/api/services/CHostPrototype.php:1729 +#: include/classes/api/services/CHostPrototype.php:1734 #: include/classes/api/services/CHttpTest.php:978 #: include/classes/api/services/CHttpTest.php:1074 #: include/classes/api/services/CItemGeneral.php:495 @@ -21269,7 +21291,7 @@ msgstr "краткое описание" #: include/classes/api/services/CTriggerGeneral.php:800 #: include/classes/api/services/CTriggerGeneral.php:833 #: include/classes/api/services/CValueMap.php:579 -#: include/classes/validators/CActionCondValidator.php:145 +#: include/classes/validators/CActionCondValidator.php:146 msgid "should be empty" msgstr "должно быть пустым" @@ -21335,6 +21357,7 @@ msgstr "заданная учётная запись не уникальна" #: app/partials/monitoring.problem.filter.php:172 #: app/partials/monitoring.problem.filter.php:353 #: app/views/administration.usergroup.edit.php:182 +#: app/views/popup.service.edit.php:98 #: include/classes/api/services/CUserGroup.php:470 #: include/classes/helpers/CTagFilterFieldHelper.php:63 #: include/classes/helpers/CTagFilterFieldHelper.php:117 @@ -21364,10 +21387,10 @@ msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз" #: include/classes/api/services/CDiscoveryRule.php:2019 #: include/classes/api/services/CHost.php:1945 #: include/classes/api/services/CHost.php:2140 -#: include/classes/api/services/CHostPrototype.php:1673 -#: include/classes/api/services/CHostPrototype.php:1685 -#: include/classes/api/services/CHostPrototype.php:1701 -#: include/classes/api/services/CHostPrototype.php:1713 +#: include/classes/api/services/CHostPrototype.php:1678 +#: include/classes/api/services/CHostPrototype.php:1690 +#: include/classes/api/services/CHostPrototype.php:1706 +#: include/classes/api/services/CHostPrototype.php:1718 #: include/classes/api/services/CHttpTest.php:739 #: include/classes/api/services/CReport.php:203 #: include/classes/api/services/CReport.php:592 @@ -21379,7 +21402,7 @@ msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз" #: include/classes/helpers/CDashboardHelper.php:390 #: include/classes/helpers/CDashboardHelper.php:398 #: include/classes/helpers/CDashboardHelper.php:408 -#: include/classes/validators/CApiInputValidator.php:994 +#: include/classes/validators/CApiInputValidator.php:1024 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "параметр \"%1$s\" отсутствует" @@ -21396,6 +21419,7 @@ msgstr "таблица \"%1$s\" не найдена" #: include/classes/import/validators/C50XmlValidator.php:2126 #: include/classes/import/validators/C52XmlValidator.php:2216 #: include/classes/import/validators/C54XmlValidator.php:2271 +#: include/classes/import/validators/C60XmlValidator.php:2272 #: include/classes/import/validators/CXmlValidatorGeneral.php:183 #: include/classes/import/validators/CXmlValidatorGeneral.php:202 #, c-format @@ -21414,7 +21438,7 @@ msgstr "ожидается третий параметр" msgid "time filter default period exceeds the max period" msgstr "период времени фильтра по умолчанию превышает максимальный период" -#: jsLoader.php:295 +#: jsLoader.php:293 msgid "time shift" msgstr "сдвиг времени" @@ -21448,11 +21472,11 @@ msgstr "trendsum() - Сумма значений за период Т с точ #: include/classes/api/services/CMap.php:857 #: include/classes/api/services/CMap.php:1325 include/events.inc.php:34 -#: include/events.inc.php:59 +#: include/events.inc.php:60 msgid "trigger" msgstr "триггер" -#: include/classes/api/services/CEvent.php:847 +#: include/classes/api/services/CEvent.php:848 msgid "trigger does not allow manual closing" msgstr "триггер не позволяет ручное закрытие" @@ -21460,11 +21484,11 @@ msgstr "триггер не позволяет ручное закрытие" msgid "trigger expression must contain at least one /host/key reference" msgstr "выражение триггера должно содержать по крайней мере одну ссылку /узел сети/ключ" -#: include/classes/api/services/CTriggerGeneral.php:1764 +#: include/classes/api/services/CTriggerGeneral.php:1750 msgid "trigger prototype cannot be moved to another template or host" msgstr "прототип триггера нельзя переместить в другой шаблон или узел сети" -#: include/classes/api/services/CTriggerGeneral.php:1930 +#: include/classes/api/services/CTriggerGeneral.php:1916 msgid "trigger with linkages cannot be moved to another template or host" msgstr "триггер со связями нельзя переместить в другой шаблон или узел сети" @@ -21477,11 +21501,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:315 +#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313 msgid "type here to search" msgstr "начните печатать для поиска" -#: include/classes/validators/CApiInputValidator.php:1884 +#: include/classes/validators/CApiInputValidator.php:1914 msgid "unacceptable URL" msgstr "неприемлемый URL" @@ -21499,6 +21523,7 @@ msgstr "неожиданная константа \"%1$s\"" #: include/classes/import/validators/C50XmlValidator.php:2281 #: include/classes/import/validators/C52XmlValidator.php:2446 #: include/classes/import/validators/C54XmlValidator.php:2501 +#: include/classes/import/validators/C60XmlValidator.php:2502 #, c-format msgid "unexpected constant value \"%1$s\"" msgstr "неожиданное значение константы \"%1$s\"" @@ -21522,7 +21547,7 @@ msgstr "неожиданное завершение макроса" #: include/classes/api/services/CGraphGeneral.php:606 #: include/classes/api/services/CGraphGeneral.php:728 #: include/classes/api/services/CHostPrototype.php:322 -#: include/classes/api/services/CHostPrototype.php:1719 +#: include/classes/api/services/CHostPrototype.php:1724 #: include/classes/api/services/CHttpTest.php:372 #: include/classes/api/services/CHttpTest.php:515 #: include/classes/api/services/CHttpTest.php:539 @@ -21532,7 +21557,7 @@ msgstr "неожиданное завершение макроса" #: include/classes/api/services/CTemplate.php:656 #: include/classes/api/services/CTriggerGeneral.php:666 #: include/classes/api/services/CValueMap.php:432 -#: include/classes/validators/CApiInputValidator.php:966 +#: include/classes/validators/CApiInputValidator.php:996 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "неожиданный параметр \"%1$s\"" @@ -21550,8 +21575,8 @@ msgstr "неожиданный тег \"%1$s\"" msgid "unexpected text \"%1$s\"" msgstr "неожиданный текст \"%1$s\"" -#: include/classes/api/services/CEvent.php:743 -#: include/classes/api/services/CEvent.php:877 +#: include/classes/api/services/CEvent.php:744 +#: include/classes/api/services/CEvent.php:878 #: include/classes/api/services/CHost.php:1816 #: include/classes/api/services/CHost.php:1822 #: include/classes/api/services/CItemGeneral.php:1271 @@ -21597,6 +21622,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:109 #: include/classes/helpers/CTagFilterFieldHelper.php:78 #: include/classes/helpers/CTagFilterFieldHelper.php:131 #: include/classes/html/CMacroValue.php:131 @@ -21616,7 +21642,7 @@ 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:391 +#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389 msgid "value" msgstr "значение" @@ -21638,36 +21664,36 @@ msgstr "значение \"%1$s\" не найдено" #: app/controllers/CControllerPopupValueMapUpdate.php:137 #: include/classes/api/services/CValueMap.php:571 #: include/classes/api/services/CValueMap.php:583 -#: include/classes/validators/CApiInputValidator.php:1701 -#: include/classes/validators/CApiInputValidator.php:1755 +#: include/classes/validators/CApiInputValidator.php:1731 +#: include/classes/validators/CApiInputValidator.php:1785 #, c-format msgid "value %1$s already exists" msgstr "значение %1$s уже существует" -#: include/classes/api/services/CTriggerGeneral.php:1815 -#: include/classes/api/services/CTriggerGeneral.php:1835 +#: include/classes/api/services/CTriggerGeneral.php:1801 +#: include/classes/api/services/CTriggerGeneral.php:1821 #: include/classes/validators/CApiInputValidator.php:339 #: include/classes/validators/CApiInputValidator.php:461 -#: include/classes/validators/CApiInputValidator.php:1077 -#: include/classes/validators/CApiInputValidator.php:1206 -#: include/classes/validators/CApiInputValidator.php:1251 -#: include/classes/validators/CApiInputValidator.php:1294 -#: include/classes/validators/CApiInputValidator.php:1348 -#: include/classes/validators/CApiInputValidator.php:1423 -#: include/classes/validators/CApiInputValidator.php:1466 -#: include/classes/validators/CApiInputValidator.php:1495 -#: include/classes/validators/CApiInputValidator.php:1526 -#: include/classes/validators/CApiInputValidator.php:1560 -#: include/classes/validators/CApiInputValidator.php:1594 -#: include/classes/validators/CApiInputValidator.php:1640 -#: include/classes/validators/CApiInputValidator.php:1842 -#: include/classes/validators/CApiInputValidator.php:1874 -#: include/classes/validators/CApiInputValidator.php:1916 -#: include/classes/validators/CApiInputValidator.php:1960 -#: include/classes/validators/CApiInputValidator.php:2009 -#: include/classes/validators/CApiInputValidator.php:2062 -#: include/classes/validators/CApiInputValidator.php:2106 -#: include/classes/validators/CApiInputValidator.php:2226 +#: include/classes/validators/CApiInputValidator.php:1107 +#: include/classes/validators/CApiInputValidator.php:1236 +#: include/classes/validators/CApiInputValidator.php:1281 +#: include/classes/validators/CApiInputValidator.php:1324 +#: include/classes/validators/CApiInputValidator.php:1378 +#: include/classes/validators/CApiInputValidator.php:1453 +#: include/classes/validators/CApiInputValidator.php:1496 +#: include/classes/validators/CApiInputValidator.php:1525 +#: include/classes/validators/CApiInputValidator.php:1556 +#: include/classes/validators/CApiInputValidator.php:1590 +#: include/classes/validators/CApiInputValidator.php:1624 +#: include/classes/validators/CApiInputValidator.php:1670 +#: include/classes/validators/CApiInputValidator.php:1872 +#: include/classes/validators/CApiInputValidator.php:1904 +#: include/classes/validators/CApiInputValidator.php:1946 +#: include/classes/validators/CApiInputValidator.php:1990 +#: include/classes/validators/CApiInputValidator.php:2039 +#: include/classes/validators/CApiInputValidator.php:2092 +#: include/classes/validators/CApiInputValidator.php:2136 +#: include/classes/validators/CApiInputValidator.php:2256 msgid "value is too long" msgstr "значение слишком длинное" @@ -21677,7 +21703,7 @@ msgstr "значение слишком длинное" msgid "value must be %1$s" msgstr "значение должно быть %1$s" -#: include/classes/validators/CApiInputValidator.php:2191 +#: include/classes/validators/CApiInputValidator.php:2221 #, c-format msgid "value must be between \"%1$s\" and \"%2$s\"" msgstr "значение должно быть между \"%1$s\" и \"%2$s\"" @@ -21697,7 +21723,7 @@ msgstr "значение должно быть не меньше чем \"%1$s\" #: include/classes/api/services/CDiscoveryRule.php:1714 #: include/classes/api/services/CDiscoveryRule.php:1734 #: include/classes/api/services/CDiscoveryRule.php:1756 -#: include/classes/api/services/CEvent.php:779 +#: include/classes/api/services/CEvent.php:780 #: include/classes/api/services/CHost.php:973 #: include/classes/api/services/CHost.php:2001 #: include/classes/api/services/CHost.php:2156 @@ -21710,14 +21736,20 @@ msgstr "значение должно быть не меньше чем \"%1$s\" #: include/classes/api/services/CReport.php:612 #: 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:455 -#: include/classes/validators/CApiInputValidator.php:780 +#: include/classes/validators/CApiInputValidator.php:785 #: include/classes/validators/CNewValidator.php:517 #: include/validate.inc.php:587 #, c-format msgid "value must be one of %1$s" msgstr "значение должно быть одно из %1$s" +#: include/classes/validators/CApiInputValidator.php:810 +#, c-format +msgid "value must be within the range of %1$s" +msgstr "" + #: include/classes/api/services/CItemGeneral.php:1560 msgid "value of first parameter is too long" msgstr "значение первого параметра слишком длинное" @@ -21743,8 +21775,8 @@ msgstr "varpop() - Дисперсия генеральной совокупно msgid "varsamp() - Sample variance" msgstr "varsamp() - Выборочная дисперсия" -#: include/actions.inc.php:582 include/actions.inc.php:600 -#: include/actions.inc.php:751 include/actions.inc.php:769 +#: include/actions.inc.php:605 include/actions.inc.php:623 +#: include/actions.inc.php:783 include/actions.inc.php:801 msgid "via" msgstr "через" @@ -21756,7 +21788,7 @@ msgstr "ошибочный тип правила обнаружения" msgid "wrong item type" msgstr "ошибочный тип элемента данных" -#: include/func.inc.php:577 jsLoader.php:211 +#: include/func.inc.php:577 jsLoader.php:209 msgctxt "year short" msgid "y" msgstr "г" |